Add a scoper object for URLFetcher::Factory

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2011 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/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/live_sync/sync_datatype_helper.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/test_url_fetcher_factory.h"
 #include "content/common/url_fetcher.h"
+#include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/test/test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 270 matching lines @@
   // integration tests on Linux causes error as we make external DNS lookups.
   resolver->AllowDirectLookup("*.thawte.com");
   resolver->AllowDirectLookup("*.geotrust.com");
   resolver->AllowDirectLookup("*.gstatic.com");
   mock_host_resolver_override_.reset(
       new net::ScopedDefaultHostResolverProc(resolver));
 }
 
 void LiveSyncTest::TearDownInProcessBrowserTestFixture() {
   mock_host_resolver_override_.reset();
-
-  // Switch back to using the default URLFetcher factory. This is a no-op if
-  // a fake factory wasn't used.
-  URLFetcher::set_factory(NULL);
 }
 
 void LiveSyncTest::ReadPasswordFile() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   password_file_ = cl->GetSwitchValuePath(switches::kPasswordFileForTest);
   if (password_file_.empty())
     LOG(FATAL) << "Can't run live server test without specifying --"
                << switches::kPasswordFileForTest << "=<filename>";
   std::string file_contents;
   file_util::ReadFileToString(password_file_, &file_contents);
@@ skipping 11 matching lines @@
 
 void LiveSyncTest::SetupMockGaiaResponses() {
   username_ = "user@gmail.com";
   password_ = "password";
   integration_factory_.reset(new URLFetcherFactory());
   factory_.reset(new FakeURLFetcherFactory(integration_factory_.get()));
   factory_->SetFakeResponse(kClientLoginUrl, "SID=sid\nLSID=lsid", true);
   factory_->SetFakeResponse(kGetUserInfoUrl, "email=user@gmail.com", true);
   factory_->SetFakeResponse(kIssueAuthTokenUrl, "auth", true);
   factory_->SetFakeResponse(kSearchDomainCheckUrl, ".google.com", true);
-  URLFetcher::set_factory(factory_.get());
 }
 
 // Start up a local sync server based on the value of server_type_, which
 // was determined from the command line parameters.
 void LiveSyncTest::SetUpTestServerIfRequired() {
   if (server_type_ == LOCAL_PYTHON_SERVER) {
     if (!SetUpLocalPythonTestServer())
       LOG(FATAL) << "Failed to set up local python test server";
   } else if (server_type_ == LOCAL_LIVE_SERVER) {
     if (!SetUpLocalTestServer())
@@ skipping 154 matching lines @@
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }