Move CaptivePortalDetector to src/components/captive_portal

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 36 matching lines @@
 class MockCaptivePortalTabReloader : public CaptivePortalTabReloader {
  public:
   MockCaptivePortalTabReloader()
       : CaptivePortalTabReloader(NULL, NULL, base::Callback<void()>()) {
   }
 
   MOCK_METHOD1(OnLoadStart, void(bool));
   MOCK_METHOD1(OnLoadCommitted, void(int));
   MOCK_METHOD0(OnAbort, void());
   MOCK_METHOD1(OnRedirect, void(bool));
-  MOCK_METHOD2(OnCaptivePortalResults, void(Result, Result));
+  MOCK_METHOD2(OnCaptivePortalResults,
+               void(CaptivePortalResult, CaptivePortalResult));
 };
 
 // Inherits from the ChromeRenderViewHostTestHarness 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 ChromeRenderViewHostTestHarness {
  public:
   CaptivePortalTabHelperTest()
       : tab_helper_(NULL),
@@ skipping 104 matching lines @@
     // Make sure that above call resulted in abort, for tests that continue
     // after the abort.
     EXPECT_CALL(mock_reloader(), OnAbort()).Times(0);
   }
 
   CaptivePortalTabHelper& tab_helper() {
     return tab_helper_;
   }
 
   // Simulates a captive portal redirect by calling the Observe method.
-  void ObservePortalResult(Result previous_result, Result result) {
+  void ObservePortalResult(CaptivePortalResult previous_result,
+                           CaptivePortalResult result) {
     content::Source<Profile> source_profile(NULL);
 
     CaptivePortalService::Results results;
     results.previous_result = previous_result;
     results.result = result;
     content::Details<CaptivePortalService::Results> details_results(&results);
 
     EXPECT_CALL(mock_reloader(), OnCaptivePortalResults(previous_result,
                                                         result)).Times(1);
     tab_helper().Observe(chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
@@ skipping 417 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