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

18 files changed, 74 insertions, 51 deletions

diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 01df25b..fb81500 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -33,18 +33,19 @@ class CookieOptions;
 class IOBuffer;
 class SSLCertRequestInfo;
 class UploadData;
+class URLRequestJob;
 class X509Certificate;
 }  // namespace net
 
 class FilePath;
 class URLRequestContext;
-class URLRequestJob;
 
 // This stores the values of the Set-Cookie headers received during the request.
 // Each item in the vector corresponds to a Set-Cookie: line received,
 // excluding the "Set-Cookie:" part.
 typedef std::vector<std::string> ResponseCookies;
 
+namespace net {
 //-----------------------------------------------------------------------------
 // A class  representing the asynchronous load of a data stream from an URL.
 //
@@ -643,4 +644,8 @@ class URLRequest : public NonThreadSafe {
   DISALLOW_COPY_AND_ASSIGN(URLRequest);
 };
 
+}  // namespace net
+
+typedef net::URLRequest URLRequest;
+
 #endif  // NET_URL_REQUEST_URL_REQUEST_H_
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index f935f5f..38692ad 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -31,8 +31,8 @@ class HttpAuthHandlerFactory;
 class HttpNetworkDelegate;
 class HttpTransactionFactory;
 class SSLConfigService;
-}
 class URLRequest;
+}  // namespace net
 
 // Subclass to provide application-specific context for URLRequest instances.
 class URLRequestContext
diff --git a/net/url_request/url_request_data_job.h b/net/url_request/url_request_data_job.h
index 1bb868a..7171088 100644
--- a/net/url_request/url_request_data_job.h
+++ b/net/url_request/url_request_data_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -11,17 +11,19 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_simple_job.h"
 
+namespace net {
 class URLRequest;
+}  // namespace net
 
 class URLRequestDataJob : public URLRequestSimpleJob {
  public:
-  explicit URLRequestDataJob(URLRequest* request);
+  explicit URLRequestDataJob(net::URLRequest* request);
 
   virtual bool GetData(std::string* mime_type,
                        std::string* charset,
                        std::string* data) const;
 
-  static URLRequest::ProtocolFactory Factory;
+  static net::URLRequest::ProtocolFactory Factory;
 
  private:
   ~URLRequestDataJob();
@@ -30,4 +32,3 @@ class URLRequestDataJob : public URLRequestSimpleJob {
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H_
-
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index 4bb7195..1aeffac 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -8,7 +8,7 @@
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 
-URLRequestErrorJob::URLRequestErrorJob(URLRequest* request, int error)
+URLRequestErrorJob::URLRequestErrorJob(net::URLRequest* request, int error)
     : URLRequestJob(request), error_(error) {
 }
 
diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h
index efaea0c..6e7c879 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 //
@@ -13,15 +13,16 @@
 
 class URLRequestErrorJob : public URLRequestJob {
  public:
-  URLRequestErrorJob(URLRequest* request, int error);
+  URLRequestErrorJob(net::URLRequest* request, int error);
 
   virtual void Start();
 
  private:
   ~URLRequestErrorJob() {}
 
-  int error_;
   void StartAsync();
+
+  int error_;
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h
index c78de97..aefaf5b 100644
--- a/net/url_request/url_request_file_dir_job.h
+++ b/net/url_request/url_request_file_dir_job.h
@@ -17,7 +17,7 @@ class URLRequestFileDirJob
   : public URLRequestJob,
     public net::DirectoryLister::DirectoryListerDelegate {
  public:
-  URLRequestFileDirJob(URLRequest* request, const FilePath& dir_path);
+  URLRequestFileDirJob(net::URLRequest* request, const FilePath& dir_path);
 
   // URLRequestJob methods:
   virtual void Start();
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc
index 44863e3..fb305b2 100644
--- a/net/url_request/url_request_filter.cc
+++ b/net/url_request/url_request_filter.cc
@@ -18,8 +18,8 @@ URLRequestFilter* URLRequestFilter::GetInstance() {
 }
 
 /* static */
-URLRequestJob* URLRequestFilter::Factory(URLRequest* request,
-                                         const std::string& scheme) {
+net::URLRequestJob* URLRequestFilter::Factory(net::URLRequest* request,
+                                              const std::string& scheme) {
   // Returning null here just means that the built-in handler will be used.
   return GetInstance()->FindRequestHandler(request, scheme);
 }
@@ -112,9 +112,10 @@ void URLRequestFilter::ClearHandlers() {
 
 URLRequestFilter::URLRequestFilter() : hit_count_(0) { }
 
-URLRequestJob* URLRequestFilter::FindRequestHandler(URLRequest* request,
-                                                    const std::string& scheme) {
-  URLRequestJob* job = NULL;
+net::URLRequestJob* URLRequestFilter::FindRequestHandler(
+    net::URLRequest* request,
+    const std::string& scheme) {
+  net::URLRequestJob* job = NULL;
   if (request->url().is_valid()) {
     // Check the hostname map first.
     const std::string& hostname = request->url().host();
diff --git a/net/url_request/url_request_filter.h b/net/url_request/url_request_filter.h
index 17eb4bb..c3021cb 100644
--- a/net/url_request/url_request_filter.h
+++ b/net/url_request/url_request_filter.h
@@ -27,7 +27,10 @@
 #include "net/url_request/url_request.h"
 
 class GURL;
+
+namespace net {
 class URLRequestJob;
+}  // namespace net
 
 class URLRequestFilter {
  public:
@@ -67,8 +70,8 @@ class URLRequestFilter {
   URLRequestFilter();
 
   // Helper method that looks up the request in the url_handler_map_.
-  URLRequestJob* FindRequestHandler(URLRequest* request,
-                                    const std::string& scheme);
+  net::URLRequestJob* FindRequestHandler(URLRequest* request,
+                                         const std::string& scheme);
 
   // Maps hostnames to factories.  Hostnames take priority over URLs.
   HostnameHandlerMap hostname_handler_map_;
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 48f963d..bd2fdc8 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -22,9 +22,10 @@ class URLRequestContext;
 class URLRequestFtpJob : public URLRequestJob {
  public:
 
-  explicit URLRequestFtpJob(URLRequest* request);
+  explicit URLRequestFtpJob(net::URLRequest* request);
 
-  static URLRequestJob* Factory(URLRequest* request, const std::string& scheme);
+  static URLRequestJob* Factory(net::URLRequest* request,
+                                const std::string& scheme);
 
   // URLRequestJob methods:
   virtual bool GetMimeType(std::string* mime_type) const;
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index c981047..c9139b0 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -27,10 +27,11 @@ class URLRequestContext;
 // provides an implementation for both HTTP and HTTPS.
 class URLRequestHttpJob : public URLRequestJob {
  public:
-  static URLRequestJob* Factory(URLRequest* request, const std::string& scheme);
+  static URLRequestJob* Factory(net::URLRequest* request,
+                                const std::string& scheme);
 
  protected:
-  explicit URLRequestHttpJob(URLRequest* request);
+  explicit URLRequestHttpJob(net::URLRequest* request);
 
   // URLRequestJob methods:
   virtual void SetUpload(net::UploadData* upload);
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 56496ed..239f5e9 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -23,13 +23,15 @@ class HttpRequestHeaders;
 class HttpResponseInfo;
 class IOBuffer;
 class UploadData;
+class URLRequest;
 class X509Certificate;
-}
+}  // namespace net
 
-class URLRequest;
 class URLRequestStatus;
 class URLRequestJobMetrics;
 
+namespace net {
+
 class URLRequestJob : public base::RefCounted<URLRequestJob>,
                       public FilterContext {
  public:
@@ -40,11 +42,11 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
   // congestion window on stalling of transmissions.
   static const size_t kSdchPacketHistogramCount = 5;
 
-  explicit URLRequestJob(URLRequest* request);
+  explicit URLRequestJob(net::URLRequest* request);
 
   // Returns the request that owns this job. THIS POINTER MAY BE NULL if the
   // request was destroyed.
-  URLRequest* request() const {
+  net::URLRequest* request() const {
     return request_;
   }
 
@@ -278,7 +280,7 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
 
   // The request that initiated this job. This value MAY BE NULL if the
   // request was released by DetachRequest().
-  URLRequest* request_;
+  net::URLRequest* request_;
 
   // The status of the job.
   const URLRequestStatus GetStatus();
@@ -420,4 +422,8 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
   DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
 };
 
+}  // namespace net
+
+typedef net::URLRequestJob URLRequestJob;
+
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_
diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h
index f459f40..0fbc31e 100644
--- a/net/url_request/url_request_job_manager.h
+++ b/net/url_request/url_request_job_manager.h
@@ -33,18 +33,18 @@ class URLRequestJobManager {
   // Instantiate an URLRequestJob implementation based on the registered
   // interceptors and protocol factories.  This will always succeed in
   // returning a job unless we are--in the extreme case--out of memory.
-  URLRequestJob* CreateJob(URLRequest* request) const;
+  net::URLRequestJob* CreateJob(net::URLRequest* request) const;
 
   // Allows interceptors to hijack the request after examining the new location
   // of a redirect. Returns NULL if no interceptor intervenes.
-  URLRequestJob* MaybeInterceptRedirect(URLRequest* request,
-                                        const GURL& location) const;
+  net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
+                                             const GURL& location) const;
 
   // Allows interceptors to hijack the request after examining the response
   // status and headers. This is also called when there is no server response
   // at all to allow interception of failed requests due to network errors.
   // Returns NULL if no interceptor intervenes.
-  URLRequestJob* MaybeInterceptResponse(URLRequest* request) const;
+  net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) const;
 
   // Returns true if there is a protocol factory registered for the given
   // scheme.  Note: also returns true if there is a built-in handler for the
diff --git a/net/url_request/url_request_job_tracker.h b/net/url_request/url_request_job_tracker.h
index 8b554b9..cd0bd86 100644
--- a/net/url_request/url_request_job_tracker.h
+++ b/net/url_request/url_request_job_tracker.h
@@ -11,7 +11,10 @@
 #include "base/observer_list.h"
 #include "net/url_request/url_request_status.h"
 
+namespace net {
 class URLRequestJob;
+}  // namespace net
+
 class GURL;
 
 // This class maintains a list of active URLRequestJobs for debugging purposes.
@@ -23,25 +26,25 @@ class GURL;
 //
 class URLRequestJobTracker {
  public:
-  typedef std::vector<URLRequestJob*> JobList;
+  typedef std::vector<net::URLRequestJob*> JobList;
   typedef JobList::const_iterator JobIterator;
 
   // The observer's methods are called on the thread that called AddObserver.
   class JobObserver {
    public:
     // Called after the given job has been added to the list
-    virtual void OnJobAdded(URLRequestJob* job) = 0;
+    virtual void OnJobAdded(net::URLRequestJob* job) = 0;
 
     // Called after the given job has been removed from the list
-    virtual void OnJobRemoved(URLRequestJob* job) = 0;
+    virtual void OnJobRemoved(net::URLRequestJob* job) = 0;
 
     // Called when the given job has completed, before notifying the request
-    virtual void OnJobDone(URLRequestJob* job,
+    virtual void OnJobDone(net::URLRequestJob* job,
                            const URLRequestStatus& status) = 0;
 
     // Called when the given job is about to follow a redirect to the given
     // new URL. The redirect type is given in status_code
-    virtual void OnJobRedirect(URLRequestJob* job, const GURL& location,
+    virtual void OnJobRedirect(net::URLRequestJob* job, const GURL& location,
                                int status_code) = 0;
 
     // Called when a new chunk of unfiltered bytes has been read for
@@ -49,7 +52,7 @@ class URLRequestJobTracker {
     // read event only. |buf| is a pointer to the data buffer that
     // contains those bytes. The data in |buf| is only valid for the
     // duration of the OnBytesRead callback.
-    virtual void OnBytesRead(URLRequestJob* job, const char* buf,
+    virtual void OnBytesRead(net::URLRequestJob* job, const char* buf,
                              int byte_count) = 0;
 
     virtual ~JobObserver() {}
@@ -70,16 +73,16 @@ class URLRequestJobTracker {
   // adds or removes the job from the active list, should be called by the
   // job constructor and destructor. Note: don't use "AddJob" since that
   // is #defined by windows.h :(
-  void AddNewJob(URLRequestJob* job);
-  void RemoveJob(URLRequestJob* job);
+  void AddNewJob(net::URLRequestJob* job);
+  void RemoveJob(net::URLRequestJob* job);
 
   // Job status change notifications
-  void OnJobDone(URLRequestJob* job, const URLRequestStatus& status);
-  void OnJobRedirect(URLRequestJob* job, const GURL& location,
+  void OnJobDone(net::URLRequestJob* job, const URLRequestStatus& status);
+  void OnJobRedirect(net::URLRequestJob* job, const GURL& location,
                      int status_code);
 
   // Bytes read notifications.
-  void OnBytesRead(URLRequestJob* job, const char* buf, int byte_count);
+  void OnBytesRead(net::URLRequestJob* job, const char* buf, int byte_count);
 
   // allows iteration over all active jobs
   JobIterator begin() const {
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index d8a1a3e..001da10 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 
-URLRequestRedirectJob::URLRequestRedirectJob(URLRequest* request,
+URLRequestRedirectJob::URLRequestRedirectJob(net::URLRequest* request,
                                              GURL redirect_destination)
     : URLRequestJob(request), redirect_destination_(redirect_destination) {
 }
diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h
index 55c34a7..7466cec 100644
--- a/net/url_request/url_request_redirect_job.h
+++ b/net/url_request/url_request_redirect_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -16,7 +16,7 @@ class GURL;
 class URLRequestRedirectJob : public URLRequestJob {
  public:
   // Constructs a job that redirects to the specified URL.
-  URLRequestRedirectJob(URLRequest* request, GURL redirect_destination);
+  URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination);
 
   virtual void Start();
   bool IsRedirectResponse(GURL* location, int* http_status_code);
@@ -30,4 +30,3 @@ class URLRequestRedirectJob : public URLRequestJob {
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_REDIRECT_JOB_H_
-
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index 2f23d58..38e0c4d 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -9,7 +9,7 @@
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 
-URLRequestSimpleJob::URLRequestSimpleJob(URLRequest* request)
+URLRequestSimpleJob::URLRequestSimpleJob(net::URLRequest* request)
     : URLRequestJob(request),
       data_offset_(0) {
 }
diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h
index bcc4047..877b0811a 100644
--- a/net/url_request/url_request_simple_job.h
+++ b/net/url_request/url_request_simple_job.h
@@ -10,11 +10,13 @@
 
 #include "net/url_request/url_request_job.h"
 
+namespace net {
 class URLRequest;
+}  // namespace net
 
-class URLRequestSimpleJob : public URLRequestJob {
+class URLRequestSimpleJob : public net::URLRequestJob {
  public:
-  explicit URLRequestSimpleJob(URLRequest* request);
+  explicit URLRequestSimpleJob(net::URLRequest* request);
 
   virtual void Start();
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index 7cb4777..14b90d4 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -33,7 +33,7 @@
 //
 // Optionally, you can also construct test jobs that advance automatically
 // without having to call ProcessOnePendingMessage.
-class URLRequestTestJob : public URLRequestJob {
+class URLRequestTestJob : public net::URLRequestJob {
  public:
   // Constructs a job to return one of the canned responses depending on the
   // request url, with auto advance disabled.