Revert 167337 - Move url_request_test_util into net namespace

chrome/browser/net/chrome_network_delegate_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/net/chrome_network_delegate.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/api/prefs/pref_member.h"
@@ skipping 28 matching lines @@
   scoped_ptr<ChromeNetworkDelegate> CreateNetworkDelegate() {
     return scoped_ptr<ChromeNetworkDelegate>(new ChromeNetworkDelegate(
         forwarder_.get(), NULL, NULL, NULL, NULL, NULL, &pref_member_, NULL,
         NULL, NULL));
   }
 
   // Implementation moved here for access to private bits.
   void NeverThrottleLogicImpl() {
     scoped_ptr<ChromeNetworkDelegate> delegate(CreateNetworkDelegate());
 
-    net::TestURLRequestContext context;
-    net::TestURLRequest extension_request(
+    TestURLRequestContext context;
+    TestURLRequest extension_request(
         GURL("http://example.com/"), NULL, &context);
     extension_request.set_first_party_for_cookies(
         GURL("chrome-extension://abcdef/bingo.html"));
-    net::TestURLRequest web_page_request(
+    TestURLRequest web_page_request(
         GURL("http://example.com/"), NULL, &context);
     web_page_request.set_first_party_for_cookies(
         GURL("http://example.com/helloworld.html"));
 
     ASSERT_TRUE(delegate->OnCanThrottleRequest(extension_request));
     ASSERT_FALSE(delegate->OnCanThrottleRequest(web_page_request));
 
     delegate->NeverThrottleRequests();
     ASSERT_TRUE(ChromeNetworkDelegate::g_never_throttle_requests_);
     ASSERT_FALSE(delegate->OnCanThrottleRequest(extension_request));
@@ skipping 58 matching lines @@
   }
 
   // Does a request using the |url_string| URL and verifies that the expected
   // string is equal to the query part (between ? and #) of the final url of
   // that request.
   void CheckAddedParameters(const std::string& url_string,
                             const std::string& expected_query_parameters) {
     // Show the URL in the trace so we know where we failed.
     SCOPED_TRACE(url_string);
 
-    net::TestURLRequest request(GURL(url_string), &delegate_, &context_);
+    TestURLRequest request(GURL(url_string), &delegate_, &context_);
 
     request.Start();
     MessageLoop::current()->RunUntilIdle();
 
     EXPECT_EQ(expected_query_parameters, request.url().query());
   }
 
  private:
   scoped_refptr<extensions::EventRouterForwarder> forwarder_;
   TestingProfile profile_;
   TestingPrefService prefs_;
   BooleanPrefMember enable_referrers_;
   BooleanPrefMember force_google_safe_search_;
   scoped_ptr<net::URLRequest> request_;
-  net::TestURLRequestContext context_;
-  net::TestDelegate delegate_;
+  TestURLRequestContext context_;
+  TestDelegate delegate_;
   MessageLoopForIO message_loop_;
   scoped_ptr<content::TestBrowserThread> io_thread_;
 };
 
 TEST_F(ChromeNetworkDelegateSafeSearchTest, SafeSearchOn) {
   // Tests with SafeSearch on, request parameters should be rewritten.
   const std::string kSafeParameter = chrome::kSafeSearchSafeParameter;
   const std::string kSsuiParameter = chrome::kSafeSearchSsuiParameter;
   const std::string kBothParameters = kSafeParameter + "&" + kSsuiParameter;
   SetSafeSearch(true);
@@ skipping 115 matching lines @@
                        "q=google");
 
   // Test the home page with parameters and safe set to off.
   CheckAddedParameters("http://google.com/search?q=google&safe=off",
                        "q=google&safe=off");
 
   // Test the home page with parameters and safe set to active.
   CheckAddedParameters("http://google.com/search?q=google&safe=active",
                        "q=google&safe=active");
 }