Switch CaptivePortalTabHelper to use WebContentsUserData.

chrome/browser/captive_portal/captive_portal_tab_helper_unittest.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/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/captive_portal/captive_portal_service.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
@@ skipping 47 matching lines @@
   MOCK_METHOD2(OnCaptivePortalResults, void(Result, Result));
 };
 
 // Inherits from the TabContentsTestHarness to gain access to
 // CreateTestWebContents.  Since the tests need to micromanage order of
 // WebContentsObserver function calls, does not actually make sure of
 // the harness in any other way.
 class CaptivePortalTabHelperTest : public TabContentsTestHarness {
  public:
   CaptivePortalTabHelperTest()
-      : tab_helper_(NULL, NULL),
+      : tab_helper_(NULL),
         mock_reloader_(new testing::StrictMock<MockCaptivePortalTabReloader>),
         ui_thread_(content::BrowserThread::UI, &message_loop_) {
     tab_helper_.SetTabReloaderForTest(mock_reloader_);
   }
   virtual ~CaptivePortalTabHelperTest() {}
 
   virtual void SetUp() OVERRIDE {
     TabContentsTestHarness::SetUp();
     web_contents1_.reset(CreateTestWebContents());
     web_contents2_.reset(CreateTestWebContents());
@@ skipping 531 matching lines @@
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(RESULT_BEHIND_CAPTIVE_PORTAL, RESULT_NO_RESPONSE);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 
   ObservePortalResult(RESULT_NO_RESPONSE, RESULT_INTERNET_CONNECTED);
   EXPECT_FALSE(tab_helper().IsLoginTab());
 }
 
 }  // namespace captive_portal