Captive Portal Interstitial: Use SSID even if connection type isn't Wi-Fi.

chrome/browser/ssl/captive_portal_blocking_page.h

 // 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.
 
 #ifndef CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
 #define CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "chrome/browser/interstitials/security_interstitial_page.h"
 #include "url/gurl.h"
 
 namespace content{
 class WebContents;
 }
 
 // This class is responsible for showing/hiding the interstitial page that is
 // shown when a captive portal triggers an SSL error.
 // It deletes itself when the interstitial page is closed.
 //
 // This class should only be used on the UI thread because its implementation
 // uses captive_portal::CaptivePortalService, which can only be accessed on the
 // UI thread. Only used when ENABLE_CAPTIVE_PORTAL_DETECTION is true.
 class CaptivePortalBlockingPage : public SecurityInterstitialPage {
  public:
   // Interstitial type, for testing.
   static const void* kTypeForTesting;
 
+  class Delegate {
+   public:
+    virtual ~Delegate() {}
+
+    // Returns true if the connection is a Wi-Fi connection.
+    virtual bool IsWifiConnection() const = 0;
+    // Returns the SSID of the connected Wi-Fi network, if any.
+    virtual std::string GetWiFiSSID() const = 0;
+  };
+
   CaptivePortalBlockingPage(content::WebContents* web_contents,
                             const GURL& request_url,
                             const GURL& login_url,
                             const base::Callback<void(bool)>& callback);
   ~CaptivePortalBlockingPage() override;
 
   // SecurityInterstitialPage method:
   const void* GetTypeForTesting() const override;
 
-  void SetWiFiConnectionForTesting(bool is_wifi_connection) {
-    is_wifi_connection_ = is_wifi_connection;
-  }
-
-  void SetWiFiSSIDForTesting(const std::string& wifi_ssid) {
-    wifi_ssid_ = wifi_ssid;
-  }
+  void SetDelegateForTesting(Delegate* delegate) { delegate_.reset(delegate); }
 
  protected:
   // SecurityInterstitialPage methods:
   void PopulateInterstitialStrings(
       base::DictionaryValue* load_time_data) override;
   bool ShouldCreateNewNavigation() const override;
 
   // InterstitialPageDelegate method:
   void CommandReceived(const std::string& command) override;
 
  private:
   // URL of the login page, opened when the user clicks the "Connect" button.
   GURL login_url_;
-  // True if on a Wi-Fi connection.
-  bool is_wifi_connection_;
-  // SSID of the connected network if the connection is a Wi-Fi connection.
-  std::string wifi_ssid_;
-
+  scoped_ptr<Delegate> delegate_;
   base::Callback<void(bool)> callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPage);
 };
 
 #endif  // CHROME_BROWSER_SSL_CAPTIVE_PORTAL_BLOCKING_PAGE_H_