Move test_url_fetcher_factory.* from content/ to net/url_request

chrome/browser/signin/signin_manager_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/signin/signin_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_unittest.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_url_fetcher_factory.h"
+#include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kGetTokenPairValidResponse[] =
     "{"
@@ skipping 28 matching lines @@
     manager_.reset(NULL);
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(NULL);
     prefs_.reset(NULL);
     TokenServiceTestHarness::TearDown();
   }
 
   void SetupFetcherAndComplete(const std::string& url,
                                int response_code,
                                const net::ResponseCookies& cookies,
                                const std::string& response_string) {
-    TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
+    net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
     DCHECK(fetcher);
     DCHECK(fetcher->delegate());
 
     fetcher->set_url(GURL(url));
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(response_code);
     fetcher->SetResponseString(response_string);
     fetcher->set_cookies(cookies);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
@@ skipping 89 matching lines @@
 
   void SimulateValidResponseGetClientInfo(bool isGPlusUser) {
     // Simulate the correct ClientLogin response.
     std::string response_string = isGPlusUser ?
         "email=user@gmail.com\nallServices=googleme" :
         "email=user@gmail.com\nallServices=";
     SetupFetcherAndComplete(GaiaUrls::GetInstance()->get_user_info_url(), 200,
                             net::ResponseCookies(), response_string);
   }
 
-  TestURLFetcherFactory factory_;
+  net::TestURLFetcherFactory factory_;
   scoped_ptr<SigninManager> manager_;
   content::TestNotificationTracker google_login_success_;
   content::TestNotificationTracker google_login_failure_;
   scoped_ptr<TestingPrefService> prefs_;
 };
 
 // NOTE: ClientLogin's "StartSignin" is called after collecting credentials
 //       from the user.
 TEST_F(SigninManagerTest, SignInClientLogin) {
   manager_->Initialize(profile_.get());
@@ skipping 262 matching lines @@
 
   manager_->ProvideOAuthChallengeResponse(
       GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "solution");
 
   SimulateProvideOAuthChallengeResponseValid();
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 
   EXPECT_EQ(1U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 }