Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 52 matching lines @@
 class WebIntentPickerCocoa;
 class WebIntentPickerController;
 class WebIntentPickerGtk;
 class WebUITestContentsCreator;
 class ZoomController;
 
 namespace browser_sync {
 class SyncedTabDelegate;
 }
 
-namespace captive_portal {
-class CaptivePortalTabHelper;
-}
-
 namespace chrome {
 namespace search {
 class SearchTabHelper;
 }
 }
 
 namespace chromeos {
 class SimpleWebViewDialog;
 class WebUILoginView;
 }
@@ skipping 101 matching lines @@
 
   // Used only for testing/automation.
   AutomationTabHelper* automation_tab_helper() {
     return automation_tab_helper_.get();
   }
 
   BlockedContentTabHelper* blocked_content_tab_helper() {
     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();
   }
 
   CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
 
   FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
   FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
   HistoryTabHelper* history_tab_helper() { return history_tab_helper_.get(); }
   HungPluginTabHelper* hung_plugin_tab_helper() {
@@ skipping 62 matching lines @@
   // Tab Helpers ---------------------------------------------------------------
   // (These provide API for callers and have a getter function listed in the
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
   scoped_refptr<AutofillManager> autofill_manager_;
   scoped_ptr<TabAutofillManagerDelegate> autofill_delegate_;
   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_;
   scoped_ptr<FindTabHelper> find_tab_helper_;
   scoped_ptr<HistoryTabHelper> history_tab_helper_;
   scoped_ptr<HungPluginTabHelper> hung_plugin_tab_helper_;
   scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
@@ skipping 39 matching lines @@
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_H_