Fix various issues from r343263.

chrome/browser/ui/webui/print_preview/print_preview_handler.cc

Index: chrome/browser/ui/webui/print_preview/print_preview_handler.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 266384fc01793776bb2105e50e19fd2d0a31082d..d0d49950342cf2c849adf994a3ab548fcb77b5d2 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -845,21 +845,19 @@ void PrintPreviewHandler::HandleGetPreview(const base::ListValue* args) {
   VLOG(1) << "Print preview request start";
 
   bool distill_page = false;
-  if (!settings->GetBoolean(printing::kSettingDistillPageEnabled,
-                            &distill_page)) {
-    NOTREACHED();
-  }
-
   bool selection_only = false;
-  if (!settings->GetBoolean(printing::kSettingShouldPrintSelectionOnly,
+  if (!settings->GetBoolean(printing::kSettingDistillPageEnabled,
+                            &distill_page) ||
+      !settings->GetBoolean(printing::kSettingShouldPrintSelectionOnly,
                             &selection_only)) {
     NOTREACHED();
   }
 
   if (distill_page && !selection_only) {
     print_preview_distiller_.reset(new PrintPreviewDistiller(
-        initiator, base::Bind(&PrintPreviewUI::OnPrintPreviewFailed,
-                              print_preview_ui()->GetWeakPtr()),
+        initiator,
+        base::Bind(&PrintPreviewHandler::OnDistillerFailed,
+                   weak_factory_.GetWeakPtr()),
         settings.Pass()));
   } else {
     RenderViewHost* rvh = initiator->GetRenderViewHost();
@@ -1115,8 +1113,7 @@ void PrintPreviewHandler::HandleGetPrinterCapabilities(
 }
 
 void PrintPreviewHandler::OnSigninComplete() {
-  if (print_preview_ui())

[Lei Zhang, 2015/08/14 05:44:35]

This has nothing to do with your CL, I just don't think this will ever fail, so
I changed it.

-    print_preview_ui()->OnReloadPrintersList();
+  print_preview_ui()->OnReloadPrintersList();
 }
 
 void PrintPreviewHandler::HandleSignin(const base::ListValue* args) {
@@ -1286,18 +1283,22 @@ void PrintPreviewHandler::SendInitialSettings(
       dom_distiller::url_utils::IsUrlDistillable(
           initiator->GetLastCommittedURL())) {
     dom_distiller::IsDistillablePage(
-        initiator, false,
-        base::Bind(&PrintPreviewHandler::HandleIsPageDistillableResult,
+        initiator, false /* is_mobile_optimized? */,
+        base::Bind(&PrintPreviewHandler::OnGotPageDistillableResult,
                    weak_factory_.GetWeakPtr()));
   }
 }
 
-void PrintPreviewHandler::HandleIsPageDistillableResult(bool distillable) {
+void PrintPreviewHandler::OnGotPageDistillableResult(bool distillable) {
   VLOG(1) << "Distillable page detection finished";
   if (distillable)
     web_ui()->CallJavascriptFunction("detectDistillablePage");
 }
 
+void PrintPreviewHandler::OnDistillerFailed() {
+  print_preview_ui()->OnPrintPreviewFailed();
+}
+
 void PrintPreviewHandler::ClosePreviewDialog() {
   print_preview_ui()->OnClosePrintPreviewDialog();
 }