Merge 117361 - Print Preview: Handle a CHECK that's getting hit in PrintPreviewHandler::HandlePri...

print_preview_handler.cc

Index: print_preview_handler.cc
===================================================================
--- print_preview_handler.cc	(revision 117588)
+++ print_preview_handler.cc	(working copy)
@@ -349,11 +349,11 @@
                        regenerate_preview_request_count_);
 
   TabContentsWrapper* initiator_tab = GetInitiatorTab();
-  CHECK(initiator_tab);
+  if (initiator_tab) {
+    RenderViewHost* rvh = initiator_tab->render_view_host();
+    rvh->Send(new PrintMsg_ResetScriptedPrintCount(rvh->routing_id()));
+  }
 
-  RenderViewHost* init_rvh = initiator_tab->render_view_host();
-  init_rvh->Send(new PrintMsg_ResetScriptedPrintCount(init_rvh->routing_id()));
-
   scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
   if (!settings.get())
     return;
@@ -420,7 +420,8 @@
     RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host();
     rvh->Send(new PrintMsg_PrintForPrintPreview(rvh->routing_id(), *settings));
   }
-  initiator_tab->print_view_manager()->PrintPreviewDone();
+  if (initiator_tab)
+    initiator_tab->print_view_manager()->PrintPreviewDone();
 }
 
 void PrintPreviewHandler::HandlePrintToPdf(