Fix captive portal histogram in SSL interstitials.

chrome/browser/ssl/ssl_blocking_page.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/ssl/ssl_blocking_page.h"
 
 #include "base/build_time.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 229 matching lines @@
   uma_helper_->RecordUserInteraction(
       SecurityInterstitialUmaHelper::TOTAL_VISITS);
 
   ssl_error_classification_.reset(new SSLErrorClassification(
       web_contents,
       base::Time::NowFromSystemTime(),
       request_url,
       cert_error_,
       *ssl_info_.cert.get()));
   ssl_error_classification_->RecordUMAStatistics(overridable_);
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
-  ssl_error_classification_->RecordCaptivePortalUMAStatistics(overridable_);
-#endif
 
   // Creating an interstitial without showing (e.g. from chrome://interstitials)
   // it leaks memory, so don't create it here.
 }
 
 bool SSLBlockingPage::ShouldCreateNewNavigation() const {
   return true;
 }
 
 const void* SSLBlockingPage::GetTypeForTesting() const {
   return SSLBlockingPage::kTypeForTesting;
 }
 
 SSLBlockingPage::~SSLBlockingPage() {
+#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
+  // Captive portal detection results can arrive anytime during the interstitial
+  // is being displayed, so record it when the interstitial is going away.
+  ssl_error_classification_->RecordCaptivePortalUMAStatistics(overridable_);
+#endif
   if (!callback_.is_null()) {
     // The page is closed without the user having chosen what to do, default to
     // deny.
     uma_helper_->RecordUserDecision(
         SecurityInterstitialUmaHelper::DONT_PROCEED);
     RecordSSLExpirationPageEventState(
         expired_but_previously_allowed_, false, overridable_);
     NotifyDenyCertificate();
   }
 }
@@ skipping 269 matching lines @@
     event_name.append(kEventNotOverridable);
   event_name.append(net::ErrorToString(cert_error_));
   return event_name;
 }
 
 // static
 bool SSLBlockingPage::IsOptionsOverridable(int options_mask) {
   return (options_mask & SSLBlockingPage::OVERRIDABLE) &&
          !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT);
 }