Distinguish between wired and wifi connections in the captive portal interstitial.

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

 // Copyright 2015 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 <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 35 matching lines @@
 }
 
 class CaptivePortalBlockingPageTest : public InProcessBrowserTest {
  public:
   CaptivePortalBlockingPageTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalBlockingPageTest);
 };
 
+// If the connection is not a Wi-Fi connection, the wired network version of the
+// captive portal interstitial should be displayed.
+IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
+                       ShowWiredNetworkInterstitial) {
+  const GURL kLandingUrl("http://captive.portal/landing_url");
+  content::WebContents* contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  DCHECK(contents);
+  // Blocking page is owned by the interstitial.
+  CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
+      contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+  blocking_page->SetWiFiConnectionForTesting(false);
+  blocking_page->Show();
+
+  WaitForInterstitialAttach(contents);
+  EXPECT_TRUE(
+      WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
+  EXPECT_FALSE(
+      IsInterstitialDisplayingText(contents->GetInterstitialPage(), "Wi-Fi"));
+}
+
+// If the connection is a Wi-Fi connection, the Wi-Fi version of the captive
+// portal interstitial should be displayed.
+IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
+                       ShowWiFiInterstitial) {
+  const GURL kLandingUrl("http://captive.portal/landing_url");
+  content::WebContents* contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  DCHECK(contents);
+  // Blocking page is owned by the interstitial.
+  CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
+      contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+  blocking_page->SetWiFiConnectionForTesting(true);
+  blocking_page->Show();
+
+  WaitForInterstitialAttach(contents);
+  EXPECT_TRUE(
+      WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
+  EXPECT_TRUE(
+      IsInterstitialDisplayingText(contents->GetInterstitialPage(), "Wi-Fi"));
+}
+
 // The captive portal interstitial should show the login url if the login url
 // is different than the captive portal ping url (i.e. the portal intercepts
 // requests via HTTP redirects).
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
                        ShowLoginDomainIfPortalRedirectsDetectionURL) {
   const GURL kLandingUrl("http://captive.portal/landing_url");
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   DCHECK(contents);
   // Blocking page is owned by the interstitial.
   CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
       contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+  blocking_page->SetWiFiConnectionForTesting(false);
   blocking_page->Show();
 
   WaitForInterstitialAttach(contents);
   EXPECT_TRUE(
       WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
 
   EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                            kLandingUrl.host()));
   EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                             kGenericLoginURLText));
 }
 
 // The captive portal interstitial should show a generic text if the login url
 // is the same as the captive portal ping url (i.e. the portal intercepts
 // requests without using HTTP redirects).
 IN_PROC_BROWSER_TEST_F(CaptivePortalBlockingPageTest,
                        DontShowLoginDomainIfPortalDoesntRedirectDetectionURL) {
   const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   DCHECK(contents);
   // Blocking page is owned by the interstitial.
   CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
       contents, GURL(kBrokenSSL), kLandingUrl, base::Callback<void(bool)>());
+  blocking_page->SetWiFiConnectionForTesting(false);
   blocking_page->Show();
 
   WaitForInterstitialAttach(contents);
   EXPECT_TRUE(
       WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
 
   EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                             kLandingUrl.host()));
   EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                            kGenericLoginURLText));
@@ skipping 21 matching lines @@
   std::string landing_url_spec =
       base::StringPrintf("http://%s/landing_url", kHostname);
   GURL landing_url(landing_url_spec);
 
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   DCHECK(contents);
   // Blocking page is owned by the interstitial.
   CaptivePortalBlockingPage* blocking_page = new CaptivePortalBlockingPage(
       contents, GURL(kBrokenSSL), landing_url, base::Callback<void(bool)>());
+  blocking_page->SetWiFiConnectionForTesting(false);
   blocking_page->Show();
 
   WaitForInterstitialAttach(contents);
   EXPECT_TRUE(
       WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
 
   EXPECT_TRUE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                            kHostnameJSUnicode));
   EXPECT_FALSE(IsInterstitialDisplayingText(contents->GetInterstitialPage(),
                                             kGenericLoginURLText));
 }