Sync: Clean up fake URLFetcher factory prior to browser shut down

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 164 matching lines @@
 
 void LiveSyncTest::TearDown() {
   // Allow the InProcessBrowserTest framework to perform its tear down.
   InProcessBrowserTest::TearDown();
 
   // Stop the local python test server. This is a no-op if one wasn't started.
   TearDownLocalPythonTestServer();
 
   // Stop the local sync test server. This is a no-op if one wasn't started.
   TearDownLocalTestServer();
-
-  // Switch back to using the default URLFetcher factory. This is a no-op if
-  // a fake factory wasn't used.
-  URLFetcher::set_factory(NULL);
 }
 
 // static
 Profile* LiveSyncTest::MakeProfile(const FilePath::StringType name) {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   return ProfileManager::CreateProfile(path.Append(name));
 }
 
 Profile* LiveSyncTest::GetProfile(int index) {
@@ skipping 75 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 174 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();
 }