Move content::URLFetcher static functions to net::URLFetcher

chrome/browser/component_updater/component_updater_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/component_updater/component_updater_service.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_interceptor.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/common/url_fetcher.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "googleurl/src/gurl.h"
 #include "libxml/globals.h"
+#include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::TestNotificationTracker;
 
 namespace {
 // Overrides some of the component updater behaviors so it is easier to test
 // and loops faster. In actual usage it takes hours do to a full cycle.
 class TestConfigurator : public ComponentUpdateService::Configurator {
@@ skipping 117 matching lines @@
       chrome::NOTIFICATION_COMPONENT_UPDATER_STARTED,
       chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING,
       chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND,
       chrome::NOTIFICATION_COMPONENT_UPDATE_READY
     };
 
     for (int ix = 0; ix != arraysize(notifications); ++ix) {
       notification_tracker_.ListenFor(
           notifications[ix], content::NotificationService::AllSources());
     }
-    content::URLFetcher::SetEnableInterceptionForTests(true);
+    net::URLFetcher::SetEnableInterceptionForTests(true);
   }
 
   ~ComponentUpdaterTest() {
-    content::URLFetcher::SetEnableInterceptionForTests(false);
+    net::URLFetcher::SetEnableInterceptionForTests(false);
   }
 
   void TearDown() {
     xmlCleanupGlobals();
   }
 
   ComponentUpdateService* component_updater() {
     return component_updater_.get();
   }
 
@@ skipping 232 matching lines @@
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   message_loop.Run();
 
   EXPECT_EQ(1, interceptor->hit_count());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 }