Fix print preview workflow to reflect settings of selected printer.

chrome/browser/printing/printing_message_filter.cc

Index: chrome/browser/printing/printing_message_filter.cc
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index 1f9ad53afe2bfa15ce6dad911b71f61e49e7f13c..f9da9088663c88aea925147d6cdfa25859538d74 100644
--- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc
@@ -288,22 +288,25 @@ void PrintingMessageFilter::OnUpdatePrintSettings(
     IPC::Message* reply_msg) {
   scoped_refptr<printing::PrinterQuery> printer_query;
   print_job_manager_->PopPrinterQuery(document_cookie, &printer_query);
-  if (printer_query.get()) {
-    CancelableTask* task = NewRunnableMethod(
-        this,
-        &PrintingMessageFilter::OnUpdatePrintSettingsReply,
-        printer_query,
-        reply_msg);
-    printer_query->SetSettings(job_settings, task);
+  if (!printer_query.get()) {
+    printer_query = new printing::PrinterQuery();

[Lei Zhang, 2011/09/02 18:44:19]

just pass an empty |printer_query| and check printer_query.get() in
OnUpdatePrintSettingsReply().

[arthurhsu, 2011/09/06 22:02:27]

It will be used in line 299 and can't be NULL.

   }
+  CancelableTask* task = NewRunnableMethod(
+      this,
+      &PrintingMessageFilter::OnUpdatePrintSettingsReply,
+      printer_query,
+      reply_msg);
+  printer_query->SetSettings(job_settings, task);
 }
 
 void PrintingMessageFilter::OnUpdatePrintSettingsReply(
     scoped_refptr<printing::PrinterQuery> printer_query,
     IPC::Message* reply_msg) {
   PrintMsg_PrintPages_Params params;
+  bool failure = false;
   if (printer_query->last_status() != printing::PrintingContext::OK) {
     params.Reset();
+    failure = true;
   } else {
     RenderParamsFromPrintSettings(printer_query->settings(), &params.params);
     params.params.document_cookie = printer_query->cookie();
@@ -312,11 +315,14 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
   }
   PrintHostMsg_UpdatePrintSettings::WriteReplyParams(reply_msg, params);
   Send(reply_msg);
+
   // If user hasn't cancelled.
-  if (printer_query->cookie() && printer_query->settings().dpi())
-    print_job_manager_->QueuePrinterQuery(printer_query.get());
-  else
-    printer_query->StopWorker();
+  if (!failure && printer_query->cookie() && printer_query->settings().dpi()) {
+      print_job_manager_->QueuePrinterQuery(printer_query.get());
+      return;
+  }
+
+  printer_query->StopWorker();
 }
 
 void PrintingMessageFilter::OnCheckForCancel(const std::string& preview_ui_addr,