net: Remove typedef net::URLRequest URLRequest;

BUG=64263
TEST=compiled locally, trybots

Review URL: http://codereview.chromium.org/5384002

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

5 files changed, 24 insertions, 25 deletions

diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index ef0091f..b50000c 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -15,7 +15,7 @@
 // code relies on.
 class AutoUpdateTestRequestJob : public URLRequestTestJob {
  public:
-  AutoUpdateTestRequestJob(URLRequest* request,
+  AutoUpdateTestRequestJob(net::URLRequest* request,
     const std::string& response_data) : URLRequestTestJob(
     request, URLRequestTestJob::test_headers(), response_data, true) {}
   virtual int GetResponseCode() const { return 200; }
@@ -26,15 +26,14 @@ class AutoUpdateTestRequestJob : public URLRequestTestJob {
 
 
 AutoUpdateInterceptor::AutoUpdateInterceptor() {
-  URLRequest::RegisterRequestInterceptor(this);
+  net::URLRequest::RegisterRequestInterceptor(this);
 }
 
 AutoUpdateInterceptor::~AutoUpdateInterceptor() {
-  URLRequest::UnregisterRequestInterceptor(this);
+  net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
-
-URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(URLRequest* request) {
+URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(net::URLRequest* request) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request->url().scheme() != "http" ||
       request->url().host() != "localhost") {
diff --git a/chrome/browser/extensions/autoupdate_interceptor.h b/chrome/browser/extensions/autoupdate_interceptor.h
index 219941a..a2e0891 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.h
+++ b/chrome/browser/extensions/autoupdate_interceptor.h
@@ -15,7 +15,7 @@
 // This url request interceptor lets us respond to localhost http request urls
 // with the contents of files on disk for use in tests.
 class AutoUpdateInterceptor
-    : public URLRequest::Interceptor,
+    : public net::URLRequest::Interceptor,
       public base::RefCountedThreadSafe<AutoUpdateInterceptor> {
  public:
   AutoUpdateInterceptor();
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index edf937b..cc20413 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -34,7 +34,7 @@ namespace {
 
 class URLRequestResourceBundleJob : public URLRequestSimpleJob {
  public:
-  explicit URLRequestResourceBundleJob(URLRequest* request,
+  explicit URLRequestResourceBundleJob(net::URLRequest* request,
       const FilePath& filename, int resource_id)
           : URLRequestSimpleJob(request),
             filename_(filename),
@@ -67,7 +67,7 @@ class URLRequestResourceBundleJob : public URLRequestSimpleJob {
 };
 
 // Returns true if an chrome-extension:// resource should be allowed to load.
-bool AllowExtensionResourceLoad(URLRequest* request,
+bool AllowExtensionResourceLoad(net::URLRequest* request,
                                 ChromeURLRequestContext* context,
                                 const std::string& scheme) {
   const ResourceDispatcherHostRequestInfo* info =
@@ -142,9 +142,9 @@ bool AllowExtensionResourceLoad(URLRequest* request,
 
 }  // namespace
 
-// Factory registered with URLRequest to create URLRequestJobs for extension://
-// URLs.
-static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
+// Factory registered with net::URLRequest to create URLRequestJobs for
+// extension:// URLs.
+static URLRequestJob* CreateExtensionURLRequestJob(net::URLRequest* request,
                                                    const std::string& scheme) {
   ChromeURLRequestContext* context =
       static_cast<ChromeURLRequestContext*>(request->context());
@@ -201,9 +201,9 @@ static URLRequestJob* CreateExtensionURLRequestJob(URLRequest* request,
   return new URLRequestFileJob(request, resource_file_path);
 }
 
-// Factory registered with URLRequest to create URLRequestJobs for
+// Factory registered with net::URLRequest to create URLRequestJobs for
 // chrome-user-script:/ URLs.
-static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
+static URLRequestJob* CreateUserScriptURLRequestJob(net::URLRequest* request,
                                                     const std::string& scheme) {
   ChromeURLRequestContext* context =
       static_cast<ChromeURLRequestContext*>(request->context());
@@ -218,8 +218,8 @@ static URLRequestJob* CreateUserScriptURLRequestJob(URLRequest* request,
 }
 
 void RegisterExtensionProtocols() {
-  URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
-                                      &CreateExtensionURLRequestJob);
-  URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
-                                      &CreateUserScriptURLRequestJob);
+  net::URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
+                                           &CreateExtensionURLRequestJob);
+  net::URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
+                                           &CreateUserScriptURLRequestJob);
 }
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index c553b1f..574e9d5 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -34,7 +34,7 @@ void UserScriptListener::ShutdownMainThread() {
 }
 
 bool UserScriptListener::ShouldDelayRequest(
-    URLRequest* request,
+    net::URLRequest* request,
     const ResourceDispatcherHostRequestInfo& request_info,
     const GlobalRequestID& request_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index ec13f9f..9658f41 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -97,7 +97,7 @@ ResourceDispatcherHostRequestInfo* CreateRequestInfo(int request_id) {
 // starts and finishes.
 class SimpleTestJob : public URLRequestTestJob {
  public:
-  explicit SimpleTestJob(URLRequest* request)
+  explicit SimpleTestJob(net::URLRequest* request)
     : URLRequestTestJob(request, test_headers(), kTestData, true) {}
  private:
   ~SimpleTestJob() {}
@@ -105,14 +105,14 @@ class SimpleTestJob : public URLRequestTestJob {
 
 class UserScriptListenerTest
     : public ExtensionsServiceTestBase,
-      public URLRequest::Interceptor {
+      public net::URLRequest::Interceptor {
  public:
   UserScriptListenerTest() {
-    URLRequest::RegisterRequestInterceptor(this);
+    net::URLRequest::RegisterRequestInterceptor(this);
   }
 
   ~UserScriptListenerTest() {
-    URLRequest::UnregisterRequestInterceptor(this);
+    net::URLRequest::UnregisterRequestInterceptor(this);
   }
 
   virtual void SetUp() {
@@ -135,13 +135,13 @@ class UserScriptListenerTest
     MessageLoop::current()->RunAllPending();
   }
 
-  // URLRequest::Interceptor
-  virtual URLRequestJob* MaybeIntercept(URLRequest* request) {
+  // net::URLRequest::Interceptor
+  virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
     return new SimpleTestJob(request);
   }
 
  protected:
-  TestURLRequest* StartTestRequest(URLRequest::Delegate* delegate,
+  TestURLRequest* StartTestRequest(net::URLRequest::Delegate* delegate,
                                    const std::string& url) {
     TestURLRequest* request = new TestURLRequest(GURL(url), delegate);
     scoped_ptr<ResourceDispatcherHostRequestInfo> rdh_info(