Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index ff18d1848b1a2896835f485b4836af2ac2fa88e7..c4f1c62d8e8fad1cf886e06cbba7f670fed2deef 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -70,10 +70,6 @@ namespace browser_sync {
 class SyncedTabDelegate;
 }
 
-namespace captive_portal {
-class CaptivePortalTabHelper;
-}
-
 namespace chrome {
 namespace search {
 class SearchTabHelper;
@@ -195,12 +191,6 @@ class TabContents : public content::WebContentsObserver {
     return blocked_content_tab_helper_.get();
   }
 
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
-  captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper() {
-    return captive_portal_tab_helper_.get();
-  }
-#endif
-
   ConstrainedWindowTabHelper* constrained_window_tab_helper() {
     return constrained_window_tab_helper_.get();
   }
@@ -283,9 +273,6 @@ class TabContents : public content::WebContentsObserver {
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
-#if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
-  scoped_ptr<captive_portal::CaptivePortalTabHelper> captive_portal_tab_helper_;
-#endif
   scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
   scoped_ptr<CoreTabHelper> core_tab_helper_;
   scoped_ptr<FaviconTabHelper> favicon_tab_helper_;