Page range comparisons should use document size.

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/print_preview/print_preview_handler.h"
 
 #include <ctype.h>
 
 #include <string>
 
@@ skipping 168 matching lines @@
   }
 
   if (settings->empty()) {
     NOTREACHED() << "Print job settings dictionary is empty";
     return NULL;
   }
 
   return settings.release();
 }
 
-void ReportPageCount(const DictionaryValue& settings,
-                     const std::string& printer_type) {
-  int count = 0;
-  const ListValue* page_range_array;
-  if (settings.GetList(printing::kSettingPageRange, &page_range_array)) {
-    for (size_t index = 0; index < page_range_array->GetSize(); ++index) {
-      const DictionaryValue* dict;
-      if (!page_range_array->GetDictionary(index, &dict))
-        continue;
-
-      printing::PageRange range;
-      if (!dict->GetInteger(printing::kSettingPageRangeFrom, &range.from) ||
-          !dict->GetInteger(printing::kSettingPageRangeTo, &range.to)) {
-        continue;
-      }
-      count += (range.to - range.from) + 1;
-    }
-  }
+void ReportPageCount(int page_count, const std::string& printer_type) {
   UMA_HISTOGRAM_COUNTS(base::StringPrintf("PrintPreview.PageCount.%s",
                                           printer_type.c_str()),
-                       count);
+                       page_count);
 }
 
 // Track the popularity of print settings and report the stats.
 void ReportPrintSettingsStats(const DictionaryValue& settings) {
   bool landscape;
   if (settings.GetBoolean(printing::kSettingLandscape, &landscape))
     ReportPrintSettingHistogram(landscape ? LANDSCAPE : PORTRAIT);
 
   bool collate;
   if (settings.GetBoolean(printing::kSettingCollate, &collate) && collate)
@@ skipping 227 matching lines @@
 #if defined(OS_MACOSX)
   open_pdf_in_preview = settings->HasKey(printing::kSettingOpenPDFInPreview);
 #endif
 
   if (!open_pdf_in_preview) {
     settings->GetBoolean(printing::kSettingPrintToPDF, &print_to_pdf);
     settings->GetBoolean(printing::kSettingCloudPrintDialog, &is_cloud_dialog);
     is_cloud_printer = settings->HasKey(printing::kSettingCloudPrintId);
   }
 
+  int page_count = 0;
+  settings->GetInteger(printing::kSettingPreviewPageCount, &page_count);
+
   if (print_to_pdf) {
-    ReportPageCount(*settings, "PrintToPDF");
+    ReportPageCount(page_count, "PrintToPDF");
     ReportUserActionHistogram(PRINT_TO_PDF);
     PrintToPdf();
     return;
   }
 
   scoped_refptr<base::RefCountedBytes> data;
   string16 title;
   if (!GetPreviewDataAndTitle(&data, &title)) {
     // Nothing to print, no preview available.
     return;
   }
 
   if (is_cloud_printer) {
-    ReportPageCount(*settings, "PrintToCloudPrint");
+    ReportPageCount(page_count, "PrintToCloudPrint");
     ReportUserActionHistogram(PRINT_WITH_CLOUD_PRINT);
     SendCloudPrintJob(data);
   } else if (is_cloud_dialog) {
-    ReportPageCount(*settings, "PrintToCloudPrintWebDialog");
+    ReportPageCount(page_count, "PrintToCloudPrintWebDialog");
     PrintWithCloudPrintDialog(data, title);
   } else {
-    ReportPageCount(*settings, "PrintToPrinter");
+    ReportPageCount(page_count, "PrintToPrinter");
     ReportUserActionHistogram(PRINT_TO_PRINTER);
     ReportPrintSettingsStats(*settings);
 
     // This tries to activate the initiator tab as well, so do not clear the
     // association with the initiator tab yet.
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         web_ui()->GetController());
     print_preview_ui->OnHidePreviewDialog();
 
     // Do this so the initiator tab can open a new print preview dialog.
@@ skipping 496 matching lines @@
     // Nothing to print, no preview available.
     return false;
   }
   DCHECK(tmp_data->size() && tmp_data->front());
 
   *data = tmp_data;
   *title = print_preview_ui->initiator_tab_title();
   return true;
 }