net: Add namespace net to the remaining files under url_request directory.

It just adds the 'namespace net' to these files and a typedef for them, because there are many
entries to fix in one pass. They will be fixed later.

BUG=64263
TEST=trybots

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

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

8 files changed, 29 insertions, 22 deletions

diff --git a/webkit/appcache/appcache_service.h b/webkit/appcache/appcache_service.h
index 4e68341..7d200b3 100644
--- a/webkit/appcache/appcache_service.h
+++ b/webkit/appcache/appcache_service.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -18,7 +18,10 @@
 #include "webkit/appcache/appcache_storage.h"
 
 class FilePath;
+
+namespace net {
 class URLRequestContext;
+}  // namespace net
 
 namespace base {
 class MessageLoopProxy;
@@ -74,8 +77,8 @@ class AppCacheService {
   // on the IO thread. We do NOT add a reference to the request context,
   // it is the callers responsibility to ensure that the pointer
   // remains valid while set.
-  URLRequestContext* request_context() const { return request_context_; }
-  void set_request_context(URLRequestContext* context) {
+  net::URLRequestContext* request_context() const { return request_context_; }
+  void set_request_context(net::URLRequestContext* context) {
     request_context_ = context;
   }
 
@@ -110,7 +113,8 @@ class AppCacheService {
   scoped_ptr<AppCacheStorage> storage_;
   PendingAsyncHelpers pending_helpers_;
   BackendMap backends_;  // One 'backend' per child process.
-  URLRequestContext* request_context_;  // Context for use during cache updates.
+  // Context for use during cache updates.
+  net::URLRequestContext* request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheService);
 };
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index e260e24..1b52e22 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -22,10 +22,10 @@ class Time;
 
 namespace net {
 class URLRequest;
+class URLRequestContext;
 }  // namespace net
 
 class GURL;
-class URLRequestContext;
 
 namespace fileapi {
 
@@ -68,7 +68,7 @@ class FileSystemOperation {
 
   virtual void Remove(const FilePath& path, bool recursive);
 
-  virtual void Write(scoped_refptr<URLRequestContext> url_request_context,
+  virtual void Write(scoped_refptr<net::URLRequestContext> url_request_context,
                      const FilePath& path,
                      const GURL& blob_url,
                      int64 offset);
diff --git a/webkit/fileapi/sandboxed_file_system_operation.h b/webkit/fileapi/sandboxed_file_system_operation.h
index d3e1ce9..bea905d 100644
--- a/webkit/fileapi/sandboxed_file_system_operation.h
+++ b/webkit/fileapi/sandboxed_file_system_operation.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -47,7 +47,7 @@ class SandboxedFileSystemOperation : public FileSystemOperation {
   virtual void ReadDirectory(const FilePath& path);
   virtual void Remove(const FilePath& path, bool recursive);
   virtual void Write(
-      scoped_refptr<URLRequestContext> url_request_context,
+      scoped_refptr<net::URLRequestContext> url_request_context,
       const FilePath& path, const GURL& blob_url, int64 offset);
   virtual void Truncate(const FilePath& path, int64 length);
   virtual void TouchFile(const FilePath& path,
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 7257b0c..85facfa 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -308,7 +308,7 @@ class ResourceLoaderBridge {
 
     // Called when the response is complete.  This method signals completion of
     // the resource load.ff
-    virtual void OnCompletedRequest(const URLRequestStatus& status,
+    virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                     const std::string& security_info,
                                     const base::Time& completion_time) = 0;
   };
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index 155a384..c126849 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -386,7 +386,8 @@ void SimpleAppCacheSystem::InitOnUIThread(const FilePath& cache_directory) {
   cache_directory_ = cache_directory;
 }
 
-void SimpleAppCacheSystem::InitOnIOThread(URLRequestContext* request_context) {
+void SimpleAppCacheSystem::InitOnIOThread(
+    net::URLRequestContext* request_context) {
   if (!is_initailized_on_ui_thread())
     return;
 
diff --git a/webkit/tools/test_shell/simple_appcache_system.h b/webkit/tools/test_shell/simple_appcache_system.h
index 14fd2f2..d850051 100644
--- a/webkit/tools/test_shell/simple_appcache_system.h
+++ b/webkit/tools/test_shell/simple_appcache_system.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -23,9 +23,8 @@ class SimpleFrontendProxy;
 
 namespace net {
 class URLRequest;
-}  // namespace net
-
 class URLRequestContext;
+}  // namespace net
 
 // A class that composes the constituent parts of an appcache system
 // together for use in a single process with two relavant threads,
@@ -50,7 +49,7 @@ class SimpleAppCacheSystem {
   // at a time, but after IO thread termination a new one can be
   // started on which this method should be called. The instance
   // is assumed to outlive the IO thread.
-  static void InitializeOnIOThread(URLRequestContext* request_context) {
+  static void InitializeOnIOThread(net::URLRequestContext* request_context) {
     if (instance_)
       instance_->InitOnIOThread(request_context);
   }
@@ -116,7 +115,7 @@ class SimpleAppCacheSystem {
 
   // Instance methods called by our static public methods
   void InitOnUIThread(const FilePath& cache_directory);
-  void InitOnIOThread(URLRequestContext* request_context);
+  void InitOnIOThread(net::URLRequestContext* request_context);
   void CleanupIOThread();
   WebKit::WebApplicationCacheHost* CreateCacheHostForWebKit(
       WebKit::WebApplicationCacheHostClient* client);
diff --git a/webkit/tools/test_shell/simple_file_writer.h b/webkit/tools/test_shell/simple_file_writer.h
index 285fc02..238546e 100644
--- a/webkit/tools/test_shell/simple_file_writer.h
+++ b/webkit/tools/test_shell/simple_file_writer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,8 +9,9 @@
 #include "base/weak_ptr.h"
 #include "webkit/fileapi/webfilewriter_base.h"
 
+namespace net {
 class URLRequestContext;
-
+}  // namespace net
 
 // An implementation of WebFileWriter for use in test_shell and DRT.
 class SimpleFileWriter : public fileapi::WebFileWriterBase,
@@ -22,7 +23,7 @@ class SimpleFileWriter : public fileapi::WebFileWriterBase,
 
   // Called by SimpleResourceLoaderBridge when the context is
   // created and destroyed.
-  static void InitializeOnIOThread(URLRequestContext* request_context) {
+  static void InitializeOnIOThread(net::URLRequestContext* request_context) {
     request_context_ = request_context;
   }
   static void CleanupOnIOThread() {
@@ -39,7 +40,7 @@ class SimpleFileWriter : public fileapi::WebFileWriterBase,
  private:
   class IOThreadProxy;
   scoped_refptr<IOThreadProxy> io_thread_proxy_;
-  static URLRequestContext* request_context_;
+  static net::URLRequestContext* request_context_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_WRITER_H_
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.h b/webkit/tools/test_shell/simple_socket_stream_bridge.h
index 8840323..a8fd821 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.h
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.h
@@ -1,15 +1,17 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_SOCKET_STREAM_BRIDGE_H_
 #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_SOCKET_STREAM_BRIDGE_H_
 
+namespace net {
 class URLRequestContext;
+}  // namespace net
 
 class SimpleSocketStreamBridge {
  public:
-  static void InitializeOnIOThread(URLRequestContext* request_context);
+  static void InitializeOnIOThread(net::URLRequestContext* request_context);
   static void Cleanup();
 };