Revert 167337 - Move url_request_test_util into net namespace

This file contains some rather generic names like "TestDelegate". Move it to the
net namespace to avoid collisions

BUG=none
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/11369179

TBR=jochen@chromium.org
Review URL: https://codereview.chromium.org/11410066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167356 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 8 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 99c9643..00f7659 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -752,7 +752,7 @@ void CFUrlRequestUnittestRunner::OnInitializationTimeout() {
 
 void CFUrlRequestUnittestRunner::OverrideHttpHost() {
   override_http_host_.reset(
-      new net::ScopedCustomUrlRequestTestHttpHost(
+      new ScopedCustomUrlRequestTestHttpHost(
           chrome_frame_test::GetLocalIPv4Address()));
 }
 
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index 43ae7246..18e24b0 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -23,10 +23,7 @@
 class CommandLine;
 class FakeBrowserProcessImpl;
 class ProcessSingleton;
-
-namespace net {
 class ScopedCustomUrlRequestTestHttpHost;
-}  // namespace net
 
 namespace content {
 class NotificationService;
@@ -125,7 +122,7 @@ class CFUrlRequestUnittestRunner
   base::ProcessHandle crash_service_;
   DWORD test_thread_id_;
 
-  scoped_ptr<net::ScopedCustomUrlRequestTestHttpHost> override_http_host_;
+  scoped_ptr<ScopedCustomUrlRequestTestHttpHost> override_http_host_;
 
   scoped_ptr<test_server::SimpleWebServer> test_http_server_;
   test_server::SimpleResponse chrome_frame_html_;
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 54f96a6..f3d7899 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -65,7 +65,7 @@ class TestURLRequest : public net::URLRequest {
  public:
   TestURLRequest(const GURL& url,
                  Delegate* delegate,
-                 net::TestURLRequestContext* context)
+                 TestURLRequestContext* context)
       : net::URLRequest(url, delegate, context) {
   }
 };
@@ -81,7 +81,7 @@ class UrlTaskChain {
 
     MessageLoopForIO loop;
 
-    net::TestURLRequestContext context;
+    TestURLRequestContext context;
     TestURLRequest r(GURL(url_), &delegate_, &context);
     r.Start();
     EXPECT_TRUE(r.is_pending());
@@ -103,7 +103,7 @@ class UrlTaskChain {
 
  protected:
   std::string url_;
-  net::TestDelegate delegate_;
+  TestDelegate delegate_;
   UrlTaskChain* next_;
 };