Revert 167337 - Move url_request_test_util into net namespace

chrome/browser/extensions/user_script_listener_unittest.cc

Index: chrome/browser/extensions/user_script_listener_unittest.cc
===================================================================
--- chrome/browser/extensions/user_script_listener_unittest.cc	(revision 167354)
+++ chrome/browser/extensions/user_script_listener_unittest.cc	(working copy)
@@ -133,12 +133,11 @@
   }
 
  protected:
-  net::TestURLRequest* StartTestRequest(net::URLRequest::Delegate* delegate,
-                                        const std::string& url_string,
-                                        net::TestURLRequestContext* context) {
+  TestURLRequest* StartTestRequest(net::URLRequest::Delegate* delegate,
+                                   const std::string& url_string,
+                                   TestURLRequestContext* context) {
     GURL url(url_string);
-    net::TestURLRequest* request =
-        new net::TestURLRequest(url, delegate, context);
+    TestURLRequest* request = new TestURLRequest(url, delegate, context);
 
     ResourceThrottle* throttle =
         listener_->CreateResourceThrottle(url, ResourceType::MAIN_FRAME);
@@ -183,9 +182,9 @@
   LoadTestExtension();
   MessageLoop::current()->RunAllPending();
 
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  TestDelegate delegate;
+  TestURLRequestContext context;
+  scoped_ptr<TestURLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -201,9 +200,9 @@
   LoadTestExtension();
   MessageLoop::current()->RunAllPending();
 
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  TestDelegate delegate;
+  TestURLRequestContext context;
+  scoped_ptr<TestURLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -223,9 +222,9 @@
 }
 
 TEST_F(UserScriptListenerTest, NoDelayNoExtension) {
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  TestDelegate delegate;
+  TestURLRequestContext context;
+  scoped_ptr<TestURLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
 
   // The request should be started immediately.
@@ -239,11 +238,11 @@
   LoadTestExtension();
   MessageLoop::current()->RunAllPending();
 
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(StartTestRequest(&delegate,
-                                                           kNotMatchingUrl,
-                                                           &context));
+  TestDelegate delegate;
+  TestURLRequestContext context;
+  scoped_ptr<TestURLRequest> request(StartTestRequest(&delegate,
+                                                      kNotMatchingUrl,
+                                                      &context));
 
   // The request should be started immediately.
   ASSERT_TRUE(request->is_pending());
@@ -269,9 +268,9 @@
       content::Source<Profile>(&profile2),
       content::Details<Extension>(extension.get()));
 
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
-  scoped_ptr<net::TestURLRequest> request(
+  TestDelegate delegate;
+  TestURLRequestContext context;
+  scoped_ptr<TestURLRequest> request(
       StartTestRequest(&delegate, kMatchingUrl, &context));
   ASSERT_FALSE(request->is_pending());
 
@@ -300,11 +299,11 @@
 TEST_F(UserScriptListenerTest, ResumeBeforeStart) {
   LoadTestExtension();
   MessageLoop::current()->RunAllPending();
-  net::TestDelegate delegate;
-  net::TestURLRequestContext context;
+  TestDelegate delegate;
+  TestURLRequestContext context;
   GURL url(kMatchingUrl);
-  scoped_ptr<net::TestURLRequest> request(
-      new net::TestURLRequest(url, &delegate, &context));
+  scoped_ptr<TestURLRequest> request(
+      new TestURLRequest(url, &delegate, &context));
 
   ResourceThrottle* throttle =
       listener_->CreateResourceThrottle(url, ResourceType::MAIN_FRAME);
Property changes on: chrome/browser/extensions/user_script_listener_unittest.cc
___________________________________________________________________
Deleted: svn:mergeinfo