Split captive portal metrics out of SSLErrorClassification

chrome/browser/interstitials/security_interstitial_page.cc

 // Copyright (c) 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/interstitials/security_interstitial_page.h"
 
 #include "base/i18n/rtl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 97 matching lines @@
                        ui::PAGE_TRANSITION_LINK, false);
   web_contents()->OpenURL(params);
 }
 
 security_interstitials::MetricsHelper*
 SecurityInterstitialPage::metrics_helper() const {
   return metrics_helper_.get();
 }
 
 void SecurityInterstitialPage::set_metrics_helper(
-    security_interstitials::MetricsHelper* metrics_helper) {
-  metrics_helper_.reset(metrics_helper);
+    scoped_ptr<security_interstitials::MetricsHelper> metrics_helper) {
+  metrics_helper_ = metrics_helper.Pass();
 }
 
 base::string16 SecurityInterstitialPage::GetFormattedHostName() const {
   std::string languages;
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (profile)
     languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
   base::string16 host =
       url_formatter::IDNToUnicode(request_url_.host(), languages);
   if (base::i18n::IsRTL())
     base::i18n::WrapStringWithLTRFormatting(&host);
   return host;
 }
 
 std::string SecurityInterstitialPage::GetHTMLContents() {
   base::DictionaryValue load_time_data;
   PopulateInterstitialStrings(&load_time_data);
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, &load_time_data);
   std::string html = ResourceBundle::GetSharedInstance()
                          .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)
                          .as_string();
   webui::AppendWebUiCssTextDefaults(&html);
   return webui::GetI18nTemplateHtml(html, &load_time_data);
 }