Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/captive_portal/captive_portal_browsertest.cc

Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 44848d9d7838f6feb9bf8f646373354cb66769a4..35ee20f92300725afbac4d330ae4f18bd35ade00 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -485,7 +485,8 @@ int NumLoadingTabs() {
 }
 
 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
@@ -1539,7 +1540,8 @@ void CaptivePortalBrowserTest::SetSlowSSLLoadTime(
 
 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