Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/captive_portal/captive_portal_browsertest.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 <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 467 matching lines @@
   for (TabContentsIterator tab_contents_it;
        !tab_contents_it.done();
        ++tab_contents_it) {
     if (tab_contents_it->web_contents()->IsLoading())
       ++num_loading_tabs;
   }
   return num_loading_tabs;
 }
 
 bool IsLoginTab(TabContents* tab_contents) {
-  return tab_contents->captive_portal_tab_helper()->IsLoginTab();
+  return captive_portal::CaptivePortalTabHelper::FromWebContents(
+      tab_contents->web_contents())->IsLoginTab();

[mmenke, 2012/09/19 16:11:30]

nit:  We're in the captive_portal namespace, so no need for the
"captive_portal::" prefix.

 }
 
 // Tracks how many times each tab has been navigated since the Observer was
 // created.  The standard TestNavigationObserver can only watch specific
 // pre-existing tabs or loads in serial for all tabs.
 class MultiNavigationObserver : public content::NotificationObserver {
  public:
   MultiNavigationObserver();
   virtual ~MultiNavigationObserver();
 
@@ skipping 1033 matching lines @@
 }
 
 void CaptivePortalBrowserTest::SetSlowSSLLoadTime(
     CaptivePortalTabReloader* tab_reloader,
     base::TimeDelta slow_ssl_load_time) {
   tab_reloader->set_slow_ssl_load_time(slow_ssl_load_time);
 }
 
 CaptivePortalTabReloader* CaptivePortalBrowserTest::GetTabReloader(
     TabContents* tab_contents) const {
-  return tab_contents->captive_portal_tab_helper()->GetTabReloaderForTest();
+  return captive_portal::CaptivePortalTabHelper::FromWebContents(
+      tab_contents->web_contents())->GetTabReloaderForTest();

[mmenke, 2012/09/19 16:11:30]

nit:  We're in the captive_portal namespace, so no need for the
"captive_portal::" prefix.

 }
 
 // Make sure there's no test for a captive portal on HTTP timeouts.  This will
 // also trigger the link doctor page, which results in the load of a second
 // error page.
 IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, HttpTimeout) {
   GURL url = URLRequestFailedJob::GetMockHttpUrl(net::ERR_CONNECTION_TIMED_OUT);
   NavigateToPageExpectNoTest(browser(), url, 2);
 }
 
@@ skipping 624 matching lines @@
       base::Bind(&AddHstsHost,
                  make_scoped_refptr(browser()->profile()->GetRequestContext()),
                  http_timeout_url.host()));
 
   SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
   Login(browser(), 1, 0);
   FailLoadsAfterLogin(browser(), 1);
 }
 
 }  // namespace captive_portal