Revert 96567 - Reland 96406 - Print preview page selection should not require a rerendering of dr...

chrome/renderer/mock_render_thread.cc

 // Copyright (c) 2011 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/renderer/mock_render_thread.h"
 
 #include <fcntl.h>
 
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/print_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "printing/print_job_constants.h"
-#include "printing/page_range.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       opener_id_(0),
       widget_(NULL),
       reply_deserializer_(NULL),
       printer_(new MockPrinter),
       print_dialog_user_response_(true),
       print_preview_pages_remaining_(0) {
@@ skipping 177 matching lines @@
 }
 
 void MockRenderThread::OnDidPrintPage(
     const PrintHostMsg_DidPrintPage_Params& params) {
   if (printer_.get())
     printer_->PrintPage(params);
 }
 
 void MockRenderThread::OnDidGetPreviewPageCount(int document_cookie,
                                                 int number_pages,
-                                                bool is_modifiable,
-                                                bool clear_preview_data) {
+                                                bool is_modifiable) {
   print_preview_pages_remaining_ = number_pages;
 }
 
 void MockRenderThread::OnDidPreviewPage(
     const PrintHostMsg_DidPreviewPage_Params& params) {
   if (params.page_number < printing::FIRST_PAGE_INDEX)
     return;
   print_preview_pages_remaining_--;
 }
 
 void MockRenderThread::OnUpdatePrintSettings(
     int document_cookie,
     const DictionaryValue& job_settings,
     PrintMsg_PrintPages_Params* params) {
   // Check and make sure the required settings are all there.
   // We don't actually care about the values.
   std::string dummy_string;
   if (!job_settings.GetBoolean(printing::kSettingLandscape, NULL) ||
       !job_settings.GetBoolean(printing::kSettingCollate, NULL) ||
       !job_settings.GetBoolean(printing::kSettingColor, NULL) ||
       !job_settings.GetBoolean(printing::kSettingPrintToPDF, NULL) ||
       !job_settings.GetString(printing::kSettingDeviceName, &dummy_string) ||
       !job_settings.GetInteger(printing::kSettingDuplexMode, NULL) ||
       !job_settings.GetInteger(printing::kSettingCopies, NULL)) {
     return;
   }
 
   // Just return the default settings.
-  if (printer_.get()) {
-    ListValue* page_range_array = new ListValue();
-    printing::PageRanges new_ranges;
-    if (job_settings.GetList(printing::kSettingPageRange, &page_range_array)) {
-      for (size_t index = 0; index < page_range_array->GetSize(); ++index) {
-        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;
-        }
-        // Page numbers are 1-based in the dictionary.
-        // Page numbers are 0-based for the printing context.
-        range.from--;
-        range.to--;
-        new_ranges.push_back(range);
-      }
-    }
-    std::vector<int> pages(printing::PageRange::GetPages(new_ranges));
-    printer_->UpdateSettings(document_cookie, params, pages);
-  }
+  if (printer_.get())
+    printer_->UpdateSettings(document_cookie, params);
 }
 
 void MockRenderThread::set_print_dialog_user_response(bool response) {
   print_dialog_user_response_ = response;
 }
 
 int MockRenderThread::print_preview_pages_remaining() {
   return print_preview_pages_remaining_;
 }