Move test_url_fetcher_factory.* from content/ to net/url_request

chrome/browser/captive_portal/captive_portal_service_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_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
-#include "content/public/test/test_url_fetcher_factory.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
+#include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace captive_portal {
 
 namespace {
 
 // A short amount of time that some tests wait for.
 const int kShortTimeMs = 10;
 
 scoped_refptr<net::HttpResponseHeaders> CreateResponseHeaders(
@@ skipping 159 matching lines @@
     base::TimeDelta expected_delay =
         base::TimeDelta::FromSeconds(expected_delay_secs);
 
     ASSERT_EQ(CaptivePortalService::STATE_IDLE, service()->state());
     ASSERT_EQ(expected_delay, GetTimeUntilNextRequest());
 
     service()->AdvanceTime(expected_delay);
     ASSERT_EQ(base::TimeDelta(), GetTimeUntilNextRequest());
 
     CaptivePortalObserver observer(profile(), service());
-    TestURLFetcherFactory factory;
+    net::TestURLFetcherFactory factory;
     service()->DetectCaptivePortal();
 
     EXPECT_EQ(CaptivePortalService::STATE_TIMER_RUNNING, service()->state());
     EXPECT_FALSE(FetchingURL());
     ASSERT_TRUE(TimerRunning());
 
     MessageLoop::current()->RunAllPending();
     EXPECT_EQ(CaptivePortalService::STATE_CHECKING_FOR_PORTAL,
               service()->state());
     ASSERT_TRUE(FetchingURL());
     EXPECT_FALSE(TimerRunning());
 
-    TestURLFetcher* fetcher = factory.GetFetcherByID(0);
+    net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
     if (net_error != net::OK) {
       EXPECT_FALSE(response_headers);
       fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                                 net_error));
     } else {
       fetcher->set_response_code(status_code);
       if (response_headers) {
         scoped_refptr<net::HttpResponseHeaders> headers(
             CreateResponseHeaders(response_headers));
         // Sanity check.
@@ skipping 218 matching lines @@
   RunTest(RESULT_BEHIND_CAPTIVE_PORTAL, net::OK, 200, 0, NULL);
 }
 
 // Check that disabling the captive portal service while a check is running
 // works.
 TEST_F(CaptivePortalServiceTest, CaptivePortalPrefDisabledWhileRunning) {
   Initialize(true);
   CaptivePortalObserver observer(profile(), service());
 
   // Needed to create the URLFetcher, even if it never returns any results.
-  TestURLFetcherFactory factory;
+  net::TestURLFetcherFactory factory;
   service()->DetectCaptivePortal();
 
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(FetchingURL());
   EXPECT_FALSE(TimerRunning());
 
   EnableCaptivePortalDetection(false);
   EXPECT_FALSE(FetchingURL());
   EXPECT_TRUE(TimerRunning());
   EXPECT_EQ(0, observer.num_results_received());
 
   MessageLoop::current()->RunAllPending();
 
   EXPECT_FALSE(FetchingURL());
   EXPECT_FALSE(TimerRunning());
   EXPECT_EQ(1, observer.num_results_received());
 
   EXPECT_EQ(RESULT_INTERNET_CONNECTED, observer.captive_portal_result());
 }
 
 // Check that disabling the captive portal service while a check is pending
 // works.
 TEST_F(CaptivePortalServiceTest, CaptivePortalPrefDisabledWhilePending) {
   Initialize(true);
   set_initial_backoff_no_portal(base::TimeDelta::FromDays(1));
 
   // Needed to create the URLFetcher, even if it never returns any results.
-  TestURLFetcherFactory factory;
+  net::TestURLFetcherFactory factory;
 
   CaptivePortalObserver observer(profile(), service());
   service()->DetectCaptivePortal();
   EXPECT_FALSE(FetchingURL());
   EXPECT_TRUE(TimerRunning());
 
   EnableCaptivePortalDetection(false);
   EXPECT_FALSE(FetchingURL());
   EXPECT_TRUE(TimerRunning());
   EXPECT_EQ(0, observer.num_results_received());
@@ skipping 13 matching lines @@
   Initialize(true);
 
   EnableCaptivePortalDetection(false);
   RunDisabledTest(0);
 
   CaptivePortalObserver observer(profile(), service());
   service()->DetectCaptivePortal();
   EXPECT_FALSE(FetchingURL());
   EXPECT_TRUE(TimerRunning());
 
-  TestURLFetcherFactory factory;
+  net::TestURLFetcherFactory factory;
 
   EnableCaptivePortalDetection(true);
   EXPECT_FALSE(FetchingURL());
   EXPECT_TRUE(TimerRunning());
 
   MessageLoop::current()->RunAllPending();
   ASSERT_TRUE(FetchingURL());
   EXPECT_FALSE(TimerRunning());
 
-  TestURLFetcher* fetcher = factory.GetFetcherByID(0);
+  net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   fetcher->set_response_code(200);
   OnURLFetchComplete(fetcher);
   EXPECT_FALSE(FetchingURL());
   EXPECT_FALSE(TimerRunning());
 
   EXPECT_EQ(1, observer.num_results_received());
   EXPECT_EQ(RESULT_BEHIND_CAPTIVE_PORTAL, observer.captive_portal_result());
 }
 
 // Checks that disabling with a command line flag works as expected.
@@ skipping 75 matching lines @@
 
   RunTest(RESULT_NO_RESPONSE,
           net::OK,
           503,
           0,
           "HTTP/1.1 503 OK\nRetry-After: Christmas\n\n");
   EXPECT_EQ(base::TimeDelta::FromSeconds(100), GetTimeUntilNextRequest());
 }
 
 }  // namespace captive_portal