Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/browser/printing/print_view_manager.cc

 // Copyright (c) 2006-2008 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/printing/print_view_manager.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printed_document.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 
 #include "generated_resources.h"
 
 using base::TimeDelta;
 
 namespace printing {
 
 PrintViewManager::PrintViewManager(WebContents& owner)
     : owner_(owner),
       waiting_to_print_(false),
       inside_inner_message_loop_(false),
       waiting_to_show_print_dialog_(false) {
+  memset(&print_params_, 0, sizeof(print_params_));
 }
 
 PrintViewManager::~PrintViewManager() {
 }
 
 void PrintViewManager::Destroy() {
   DisconnectFromCurrentPrintJob();
 }
 
 void PrintViewManager::Stop() {
@@ skipping 192 matching lines @@
     }
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
 void PrintViewManager::OnNotifyPrintJobInitEvent(
     const JobEventDetails& event_details) {
+  ViewMsg_Print_Params old_print_params(print_params_);
+
+  // Backup the print settings relevant to the renderer.
+  DCHECK_EQ(print_job_->document(), event_details.document());
+  event_details.document()->settings().RenderParams(&print_params_);
+  print_params_.document_cookie = event_details.document()->cookie();
+  DCHECK_GT(print_params_.document_cookie, 0);
+
+  // If settings changed
+  DCHECK(owner_.render_view_host());
+  // Equals() doesn't compare the cookie value.
+  if (owner_.render_view_host() &&
+      owner_.render_view_host()->IsRenderViewLive() &&
+      (!old_print_params.Equals(print_params_) ||
+       !event_details.document()->page_count())) {
+    // TODO(maruel): Will never happen, this code is about to be deleted.
+    NOTREACHED();
+  }
+
   // Continue even if owner_.render_view_host() is dead because we may already
   // have buffered all the necessary pages.
   switch (event_details.type()) {
     case JobEventDetails::USER_INIT_DONE: {
       // The user clicked the "Print" button in the Print... dialog.
       // Time to print.
       DCHECK_EQ(waiting_to_print_, false);
       DCHECK_EQ(waiting_to_show_print_dialog_, false);
       waiting_to_print_ = true;
       PrintNowInternal();
@@ skipping 181 matching lines @@
   if (!print_job_.get())
     return;
   NotificationService::current()->RemoveObserver(
       this,
       NotificationType::PRINT_JOB_EVENT,
       Source<PrintJob>(print_job_.get()));
 
   print_job_->DisconnectSource();
   // Don't close the worker thread.
   print_job_ = NULL;
+  memset(&print_params_, 0, sizeof(print_params_));
 }
 
 void PrintViewManager::PrintNowInternal() {
   DCHECK(waiting_to_print_);
 
   // Settings are already loaded. Go ahead. This will set
   // print_job_->is_job_pending() to true.
   print_job_->StartPrinting();
 
   if (!print_job_->document() ||
@@ skipping 64 matching lines @@
   }
 
   // Settings are already loaded. Go ahead. This will set
   // print_job_->is_job_pending() to true.
   print_job_->StartPrinting();
   return true;
 }
 
 }  // namespace printing