Clean up bits of PrintedDocument.

Change-Id: I75500b5732b6d7d4bd7bd8aad4de12646ea789c5
Reviewed-on: https://chromium-review.googlesource.com/1043253Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556129}

chrome/browser/printing/print_job_worker.cc

@@ -377,9 +377,7 @@ void PrintJobWorker::OnNewPage() {
     // Find first page to print.
     int page_count = document_->page_count();
     if (!page_count) {
-      // We still don't know how many pages the document contains. We can't
-      // start to print the document yet since the header/footer may refer to
-      // the document's page count.
+      // We still don't know how many pages the document contains.
       return;
     }
     // We have enough information to initialize page_number_.

printing/printed_document.cc

@@ -114,14 +114,9 @@ PrintedDocument::PrintedDocument(const PrintSettings& settings,
                                  const base::string16& name,
                                  int cookie)
     : immutable_(settings, name, cookie) {
-  // Records the expected page count if a range is setup.
-  if (!settings.ranges().empty()) {
-    // If there is a range, set the number of page
-    for (unsigned i = 0; i < settings.ranges().size(); ++i) {
-      const PageRange& range = settings.ranges()[i];
-      mutable_.expected_page_count_ += range.to - range.from + 1;
-    }
-  }
+  // If there is a range, set the number of page
+  for (const PageRange& range : settings.ranges())
+    mutable_.expected_page_count_ += range.to - range.from + 1;
 
   if (HasDebugDumpPath())
     DebugDumpSettings(name, settings);

printing/printed_document.h

@@ -91,7 +91,7 @@ class PRINTING_EXPORT PrintedDocument
   // Note: locks for a short amount of time.
   void set_page_count(int max_page);
 
-  // Number of pages in the document. Used for headers/footers.
+  // Number of pages in the document.
   // Note: locks for a short amount of time.
   int page_count() const;
 
@@ -136,10 +136,10 @@ class PRINTING_EXPORT PrintedDocument
  private:
   friend class base::RefCountedThreadSafe<PrintedDocument>;
 
-  virtual ~PrintedDocument();
+  ~PrintedDocument();
 
   // Array of data for each print previewed page.
-  typedef std::map<int, scoped_refptr<PrintedPage> > PrintedPages;
+  using PrintedPages = std::map<int, scoped_refptr<PrintedPage>>;
 
   // Contains all the mutable stuff. All this stuff MUST be accessed with the
   // lock held.