Add finch gate for captive portal interstitial.

chrome/browser/ssl/ssl_error_handler.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/ssl_error_handler.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 53 matching lines @@
 
     case SSLErrorHandler::NORMAL:
       return base::TimeDelta::FromSeconds(
           kDefaultInterstitialDisplayDelayInSeconds);
 
     default:
       NOTREACHED();
   }
   return base::TimeDelta();
 }
+
+bool IsCaptivePortalInterstitialEnabled() {
+  return base::FieldTrialList::FindFullName("CaptivePortalInterstitial") ==
+         "Enabled";
+}
 #endif
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SSLErrorHandler);
 
 void SSLErrorHandler::HandleSSLError(
     content::WebContents* web_contents,
     int cert_error,
     const net::SSLInfo& ssl_info,
@@ skipping 52 matching lines @@
 #endif
 }
 
 SSLErrorHandler::~SSLErrorHandler() {
 }
 
 void SSLErrorHandler::StartHandlingError() {
   RecordUMA(HANDLE_ALL);
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
-  CheckForCaptivePortal();
-  timer_.Start(FROM_HERE,
-               GetInterstitialDisplayDelay(g_interstitial_delay_type),
-               this, &SSLErrorHandler::OnTimerExpired);
-  if (g_timer_started_callback)
-    g_timer_started_callback->Run(web_contents_);
-#else
+  if (IsCaptivePortalInterstitialEnabled()) {
+    CheckForCaptivePortal();
+    timer_.Start(FROM_HERE,
+                 GetInterstitialDisplayDelay(g_interstitial_delay_type),
+                 this, &SSLErrorHandler::OnTimerExpired);
+    if (g_timer_started_callback)
+      g_timer_started_callback->Run(web_contents_);
+    return;
+  }
+#endif
   // Display an SSL interstitial.
   ShowSSLInterstitial();
-#endif
 }
 
 void SSLErrorHandler::OnTimerExpired() {
   ShowSSLInterstitial();
 }
 
 void SSLErrorHandler::CheckForCaptivePortal() {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
@@ skipping 42 matching lines @@
     timer_.Stop();
     CaptivePortalService::Results* results =
         content::Details<CaptivePortalService::Results>(details).ptr();
     if (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL)
       ShowCaptivePortalInterstitial();
     else
       ShowSSLInterstitial();
   }
 #endif
 }