Introduce the ChromeControllerClient class

chrome/browser/ssl/captive_portal_blocking_page.cc

 // Copyright 2014 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/ssl/captive_portal_blocking_page.h"
 
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/cert_report_helper.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
 #include "chrome/common/pref_names.h"
 #include "components/captive_portal/captive_portal_detector.h"
 #include "components/certificate_reporting/error_reporter.h"
+#include "components/security_interstitials/core/controller_client.h"
 #include "components/url_formatter/url_formatter.h"
 #include "components/wifi/wifi_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_interfaces.h"
 #include "net/ssl/ssl_info.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using security_interstitials::ControllerClient;
+
 namespace {
 
 // Events for UMA.
 enum CaptivePortalBlockingPageEvent {
   SHOW_ALL,
   OPEN_LOGIN_PAGE,
   CAPTIVE_PORTAL_BLOCKING_PAGE_EVENT_COUNT
 };
 
 void RecordUMA(CaptivePortalBlockingPageEvent event) {
@@ skipping 135 matching lines @@
   load_time_data->SetString("primaryParagraph", paragraph);
   // Explicitly specify other expected fields to empty.
   load_time_data->SetString("openDetails", base::string16());
   load_time_data->SetString("closeDetails", base::string16());
   load_time_data->SetString("explanationParagraph", base::string16());
   load_time_data->SetString("finalParagraph", base::string16());
 
   if (cert_report_helper_)
     cert_report_helper_->PopulateExtendedReportingOption(load_time_data);
   else
-    load_time_data->SetBoolean(interstitials::kDisplayCheckBox, false);
+    load_time_data->SetBoolean(security_interstitials::kDisplayCheckBox, false);
 }
 
 void CaptivePortalBlockingPage::CommandReceived(const std::string& command) {
   if (command == "\"pageLoadComplete\"") {
     // content::WaitForRenderFrameReady sends this message when the page
     // load completes. Ignore it.
     return;
   }
   int command_num = 0;
   bool command_is_num = base::StringToInt(command, &command_num);
   DCHECK(command_is_num) << command;
   // Any command other than "open the login page" is ignored.
-  if (command_num == CMD_OPEN_LOGIN) {
+  if (command_num == ControllerClient::CMD_OPEN_LOGIN) {
     RecordUMA(OPEN_LOGIN_PAGE);
     CaptivePortalTabHelper::OpenLoginTabForWebContents(web_contents(), true);
   }
 }
 
 void CaptivePortalBlockingPage::OnProceed() {
   if (cert_report_helper_) {
     // Finish collecting information about invalid certificates, if the
     // user opted in to.
     cert_report_helper_->FinishCertCollection(
         certificate_reporting::ErrorReport::USER_PROCEEDED);
   }
 }
 
 void CaptivePortalBlockingPage::OnDontProceed() {
   if (cert_report_helper_) {
     // Finish collecting information about invalid certificates, if the
     // user opted in to.
     cert_report_helper_->FinishCertCollection(
         certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED);
   }
 
   // Need to explicity deny the certificate via the callback, otherwise memory
   // is leaked.
   if (!callback_.is_null()) {
     callback_.Run(false);
     callback_.Reset();
   }
 }