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

1 files changed, 4 insertions, 5 deletions

diff --git a/jingle/glue/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc
index 662ba77..49d95f5 100644
--- a/jingle/glue/proxy_resolving_client_socket_unittest.cc
+++ b/jingle/glue/proxy_resolving_client_socket_unittest.cc
@@ -17,7 +17,7 @@
 
 namespace {
 
-class MyTestURLRequestContext : public net::TestURLRequestContext {
+class MyTestURLRequestContext : public TestURLRequestContext {
  public:
   MyTestURLRequestContext() : TestURLRequestContext(true) {
     context_storage_.set_proxy_service(
@@ -35,10 +35,9 @@ namespace jingle_glue {
 class ProxyResolvingClientSocketTest : public testing::Test {
  protected:
   ProxyResolvingClientSocketTest()
-      : url_request_context_getter_(new net::TestURLRequestContextGetter(
+      : url_request_context_getter_(new TestURLRequestContextGetter(
             base::MessageLoopProxy::current(),
-            scoped_ptr<net::TestURLRequestContext>(
-                new MyTestURLRequestContext))) {}
+            scoped_ptr<TestURLRequestContext>(new MyTestURLRequestContext))) {}
 
   virtual ~ProxyResolvingClientSocketTest() {}
 
@@ -49,7 +48,7 @@ class ProxyResolvingClientSocketTest : public testing::Test {
   }
 
   MessageLoop message_loop_;
-  scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
+  scoped_refptr<TestURLRequestContextGetter> url_request_context_getter_;
 };
 
 // TODO(sanjeevr): Fix this test on Linux.