Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/captive_portal/captive_portal_tab_helper.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 "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_info.h"
 
 namespace captive_portal {
 
+int CaptivePortalTabHelper::kUserDataKey;
+
 CaptivePortalTabHelper::CaptivePortalTabHelper(
-    Profile* profile,
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
+      // web_contents is NULL in unit tests.
+      profile_(web_contents ? Profile::FromBrowserContext(
+                                  web_contents->GetBrowserContext())
+                            : NULL),
       tab_reloader_(
           new CaptivePortalTabReloader(
-              profile,
+              profile_,
               web_contents,
               base::Bind(&CaptivePortalTabHelper::OpenLoginTab,
                          base::Unretained(this)))),
-      login_detector_(new CaptivePortalLoginDetector(profile)),
-      profile_(profile),
+      login_detector_(new CaptivePortalLoginDetector(profile_)),
       pending_error_code_(net::OK),
       provisional_render_view_host_(NULL) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
                  content::Source<Profile>(profile_));
   registrar_.Add(this,
                  content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
                  content::Source<content::WebContents>(web_contents));
   registrar_.Add(this,
                  content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
@@ skipping 185 matching lines @@
   Browser* browser = browser::FindTabbedBrowser(profile_, true);
   // If the Profile doesn't have a tabbed browser window open, do nothing.
   if (!browser)
     return;
 
   // Check if the Profile's topmost browser window already has a login tab.
   // If so, do nothing.
   // TODO(mmenke):  Consider focusing that tab, at least if this is the tab
   //                helper for the currently active tab for the profile.
   for (int i = 0; i < browser->tab_count(); ++i) {
-    TabContents* tab_contents = chrome::GetTabContentsAt(browser, i);
-    if (tab_contents->captive_portal_tab_helper()->IsLoginTab())
+    content::WebContents* web_contents = chrome::GetWebContentsAt(browser, i);
+    captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper =
+        captive_portal::CaptivePortalTabHelper::FromWebContents(web_contents);
+    if (captive_portal_tab_helper->IsLoginTab())
       return;
   }
 
   // Otherwise, open a login tab.  Only end up here when a captive portal result
   // was received, so it's safe to assume |profile_| has a CaptivePortalService.
   TabContents* tab_contents = chrome::AddSelectedTabWithURL(
           browser,
           CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(),
           content::PAGE_TRANSITION_TYPED);
-  tab_contents->captive_portal_tab_helper()->SetIsLoginTab();
+  captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper =
+      captive_portal::CaptivePortalTabHelper::FromWebContents(
+          tab_contents->web_contents());
+  captive_portal_tab_helper->SetIsLoginTab();
 }
 
 }  // namespace captive_portal