Fix various issues from r343263.

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

 // Copyright (c) 2012 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/ui/webui/print_preview/print_preview_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 827 matching lines @@
 
     if (draft_page_count != -1 && preview_modifiable &&
         print_preview_ui()->GetAvailableDraftPageCount() != draft_page_count) {
       settings->SetBoolean(printing::kSettingGenerateDraftData, true);
     }
   }
 
   VLOG(1) << "Print preview request start";
 
   bool distill_page = false;
+  bool selection_only = false;
   if (!settings->GetBoolean(printing::kSettingDistillPageEnabled,
-                            &distill_page)) {
-    NOTREACHED();
-  }
-
-  bool selection_only = false;
-  if (!settings->GetBoolean(printing::kSettingShouldPrintSelectionOnly,
+                            &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();
     rvh->Send(new PrintMsg_PrintPreview(rvh->GetRoutingID(), *settings));
   }
 }
 
 void PrintPreviewHandler::HandlePrint(const base::ListValue* args) {
   ReportStats();
 
@@ skipping 235 matching lines @@
       base::Bind(&PrintPreviewHandler::SendFailedToGetPrinterCapabilities,
                  weak_factory_.GetWeakPtr());
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&GetPrinterCapabilitiesOnFileThread,
                                      printer_name,
                                      g_browser_process->GetApplicationLocale(),
                                      success_cb, failure_cb));
 }
 
 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) {
   bool add_account = false;
   bool success = args->GetBoolean(0, &add_account);
   DCHECK(success);
 
   Profile* profile = Profile::FromBrowserContext(
       preview_web_contents()->GetBrowserContext());
   chrome::ScopedTabbedBrowserDisplayer displayer(
@@ skipping 149 matching lines @@
 
   if (print_preview_ui()->source_is_modifiable())
     GetNumberFormatAndMeasurementSystem(&initial_settings);
   web_ui()->CallJavascriptFunction("setInitialSettings", initial_settings);
 
   WebContents* initiator = GetInitiator();
   if (initiator && cmdline->HasSwitch(switches::kEnableDomDistiller) &&
       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();
 }
 
 void PrintPreviewHandler::SendAccessToken(const std::string& type,
                                           const std::string& access_token) {
   VLOG(1) << "Get getAccessToken finished";
   web_ui()->CallJavascriptFunction("onDidGetAccessToken",
                                    base::StringValue(type),
                                    base::StringValue(access_token));
@@ skipping 495 matching lines @@
 
 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
   if (gaia_cookie_manager_service_)
     gaia_cookie_manager_service_->RemoveObserver(this);
 }
 
 void PrintPreviewHandler::SetPdfSavedClosureForTesting(
     const base::Closure& closure) {
   pdf_file_saved_closure_ = closure;
 }