Merge 97702, 97820, 97976

chrome/renderer/mock_render_thread.cc

Index: chrome/renderer/mock_render_thread.cc
===================================================================
--- chrome/renderer/mock_render_thread.cc	(revision 98330)
+++ chrome/renderer/mock_render_thread.cc	(working copy)
@@ -25,6 +25,7 @@
       reply_deserializer_(NULL),
       printer_(new MockPrinter),
       print_dialog_user_response_(true),
+      print_preview_cancel_page_number_(-1),
       print_preview_pages_remaining_(0) {
 }
 
@@ -111,6 +112,7 @@
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetPreviewPageCount,
                         OnDidGetPreviewPageCount)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidPreviewPage, OnDidPreviewPage)
+    IPC_MESSAGE_HANDLER(PrintHostMsg_CheckForCancel, OnCheckForCancel)
 #if defined(OS_WIN)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DuplicateSection, OnDuplicateSection)
 #endif
@@ -218,11 +220,17 @@
 
 void MockRenderThread::OnDidPreviewPage(
     const PrintHostMsg_DidPreviewPage_Params& params) {
-  if (params.page_number < printing::FIRST_PAGE_INDEX)
-    return;
+  DCHECK(params.page_number >= printing::FIRST_PAGE_INDEX);
   print_preview_pages_remaining_--;
 }
 
+void MockRenderThread::OnCheckForCancel(const std::string& preview_ui_addr,
+                                        int preview_request_id,
+                                        bool* cancel) {
+  *cancel =
+      (print_preview_pages_remaining_ == print_preview_cancel_page_number_);
+}
+
 void MockRenderThread::OnUpdatePrintSettings(
     int document_cookie,
     const DictionaryValue& job_settings,
@@ -238,6 +246,7 @@
       !job_settings.GetString(printing::kSettingDeviceName, &dummy_string) ||
       !job_settings.GetInteger(printing::kSettingDuplexMode, NULL) ||
       !job_settings.GetInteger(printing::kSettingCopies, NULL) ||
+      !job_settings.GetString(printing::kPreviewUIAddr, &dummy_string) ||
       !job_settings.GetInteger(printing::kPreviewRequestID, NULL)) {
     return;
   }
@@ -251,6 +260,10 @@
   print_dialog_user_response_ = response;
 }
 
+void MockRenderThread::set_print_preview_cancel_page_number(int page) {
+  print_preview_cancel_page_number_ = page;
+}
+
 int MockRenderThread::print_preview_pages_remaining() {
   return print_preview_pages_remaining_;
 }