net: Add namespace net to URLRequest and URLRequestJob classes.

BUG=64263
TEST=compiled locally and trybots

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

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

6 files changed, 26 insertions, 17 deletions

diff --git a/webkit/appcache/appcache_host.h b/webkit/appcache/appcache_host.h
index d3743b4..0aa0351 100644
--- a/webkit/appcache/appcache_host.h
+++ b/webkit/appcache/appcache_host.h
@@ -16,7 +16,9 @@
 #include "webkit/appcache/appcache_storage.h"
 #include "webkit/glue/resource_type.h"
 
+namespace net {
 class URLRequest;
+}  // namespace net
 
 namespace appcache {
 
@@ -72,7 +74,7 @@ class AppCacheHost : public AppCacheStorage::Delegate,
   // Support for loading resources out of the appcache.
   // May return NULL if the request isn't subject to retrieval from an appache.
   AppCacheRequestHandler* CreateRequestHandler(
-      URLRequest* request, ResourceType::Type resource_type);
+      net::URLRequest* request, ResourceType::Type resource_type);
 
   // Support for devtools inspecting appcache resources.
   void GetResourceList(std::vector<AppCacheResourceInfo>* resource_infos);
diff --git a/webkit/appcache/appcache_interceptor.h b/webkit/appcache/appcache_interceptor.h
index 7af9aed..519d89b 100644
--- a/webkit/appcache/appcache_interceptor.h
+++ b/webkit/appcache/appcache_interceptor.h
@@ -40,10 +40,10 @@ class AppCacheInterceptor : public URLRequest::Interceptor {
 
  protected:
   // URLRequest::Interceptor overrides
-  virtual URLRequestJob* MaybeIntercept(URLRequest* request);
-  virtual URLRequestJob* MaybeInterceptResponse(URLRequest* request);
-  virtual URLRequestJob* MaybeInterceptRedirect(URLRequest* request,
-                                                const GURL& location);
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
+  virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
+  virtual net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
+                                                     const GURL& location);
 
  private:
   friend struct DefaultSingletonTraits<AppCacheInterceptor>;
@@ -55,8 +55,9 @@ class AppCacheInterceptor : public URLRequest::Interceptor {
   AppCacheInterceptor();
   virtual ~AppCacheInterceptor();
 
-  static void SetHandler(URLRequest* request, AppCacheRequestHandler* handler);
-  static AppCacheRequestHandler* GetHandler(URLRequest* request);
+  static void SetHandler(net::URLRequest* request,
+                         AppCacheRequestHandler* handler);
+  static AppCacheRequestHandler* GetHandler(net::URLRequest* request);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheInterceptor);
 };
diff --git a/webkit/appcache/appcache_interfaces.h b/webkit/appcache/appcache_interfaces.h
index 973f795..d29acd6 100644
--- a/webkit/appcache/appcache_interfaces.h
+++ b/webkit/appcache/appcache_interfaces.h
@@ -12,7 +12,9 @@
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 
+namespace net {
 class URLRequest;
+}  // namespace net
 
 namespace appcache {
 
@@ -141,7 +143,7 @@ extern const char kHttpHEADMethod[];
 
 bool IsSchemeSupported(const GURL& url);
 bool IsMethodSupported(const std::string& method);
-bool IsSchemeAndMethodSupported(const URLRequest* request);
+bool IsSchemeAndMethodSupported(const net::URLRequest* request);
 
 extern const FilePath::CharType kAppCacheDatabaseName[];
 
diff --git a/webkit/appcache/appcache_request_handler.h b/webkit/appcache/appcache_request_handler.h
index 8577232..fcf7f8f 100644
--- a/webkit/appcache/appcache_request_handler.h
+++ b/webkit/appcache/appcache_request_handler.h
@@ -10,8 +10,10 @@
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/glue/resource_type.h"
 
+namespace net {
 class URLRequest;
 class URLRequestJob;
+}  // namespace net
 
 namespace appcache {
 
@@ -22,17 +24,17 @@ class AppCacheURLRequestJob;
 // given the opportunity to hijack the request along the way. Callers
 // should use AppCacheHost::CreateRequestHandler to manufacture instances
 // that can retrieve resources for a particular host.
-class AppCacheRequestHandler : public URLRequest::UserData,
+class AppCacheRequestHandler : public net::URLRequest::UserData,
                                public AppCacheHost::Observer,
                                public AppCacheStorage::Delegate  {
  public:
   virtual ~AppCacheRequestHandler();
 
   // These are called on each request intercept opportunity.
-  AppCacheURLRequestJob* MaybeLoadResource(URLRequest* request);
-  AppCacheURLRequestJob* MaybeLoadFallbackForRedirect(URLRequest* request,
+  AppCacheURLRequestJob* MaybeLoadResource(net::URLRequest* request);
+  AppCacheURLRequestJob* MaybeLoadFallbackForRedirect(net::URLRequest* request,
                                                       const GURL& location);
-  AppCacheURLRequestJob* MaybeLoadFallbackForResponse(URLRequest* request);
+  AppCacheURLRequestJob* MaybeLoadFallbackForResponse(net::URLRequest* request);
 
   void GetExtraResponseInfo(int64* cache_id, GURL* manifest_url);
 
@@ -68,7 +70,7 @@ class AppCacheRequestHandler : public URLRequest::UserData,
   // Main-resource loading -------------------------------------
   // Frame and SharedWorker main resources are handled here.
 
-  void MaybeLoadMainResource(URLRequest* request);
+  void MaybeLoadMainResource(net::URLRequest* request);
 
   // AppCacheStorage::Delegate methods
   virtual void OnMainResponseFound(
@@ -80,7 +82,7 @@ class AppCacheRequestHandler : public URLRequest::UserData,
   // Sub-resource loading -------------------------------------
   // Dedicated worker and all manner of sub-resources are handled here.
 
-  void MaybeLoadSubResource(URLRequest* request);
+  void MaybeLoadSubResource(net::URLRequest* request);
   void ContinueMaybeLoadSubResource();
 
   // AppCacheHost::Observer override
diff --git a/webkit/appcache/appcache_url_request_job.h b/webkit/appcache/appcache_url_request_job.h
index 8593ca1..8630815 100644
--- a/webkit/appcache/appcache_url_request_job.h
+++ b/webkit/appcache/appcache_url_request_job.h
@@ -17,10 +17,10 @@ namespace appcache {
 
 // A URLRequestJob derivative that knows how to return a response stored
 // in the appcache.
-class AppCacheURLRequestJob : public URLRequestJob,
+class AppCacheURLRequestJob : public net::URLRequestJob,
                               public AppCacheStorage::Delegate {
  public:
-  explicit AppCacheURLRequestJob(URLRequest* request,
+  explicit AppCacheURLRequestJob(net::URLRequest* request,
                                  AppCacheStorage* storage);
   virtual ~AppCacheURLRequestJob();
 
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h
index fee0801..0131da2 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/appcache/view_appcache_internals_job.h
@@ -10,7 +10,9 @@
 #include "net/url_request/url_request_simple_job.h"
 #include "webkit/appcache/appcache_service.h"
 
+namespace net {
 class URLRequest;
+}  // namespace net
 
 namespace appcache {
 
@@ -19,7 +21,7 @@ namespace appcache {
 class ViewAppCacheInternalsJob : public URLRequestSimpleJob {
  public:
   // Stores handle to appcache service for getting information.
-  ViewAppCacheInternalsJob(URLRequest* request, AppCacheService* service);
+  ViewAppCacheInternalsJob(net::URLRequest* request, AppCacheService* service);
 
   // Fetches the AppCache Info and calls StartAsync after it is done.
   virtual void Start();