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

9 files changed, 41 insertions, 33 deletions

diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h
index b32bf78..af86341 100644
--- a/chrome_frame/cfproxy.h
+++ b/chrome_frame/cfproxy.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.
 
@@ -32,7 +32,6 @@ enum AutomationPageFontSize {
 class ChromeProxyDelegate;
 class ChromeProxyFactory;
 class GURL;
-class URLRequestStatus;
 struct AttachExternalTabParams;
 struct AutomationURLRequest;
 struct ExternalTabSettings;
@@ -40,6 +39,10 @@ struct MiniContextMenuParams;
 struct NavigationInfo;
 struct ProxyParams;
 
+namespace net {
+class URLRequestStatus;
+}  // namespace net
+
 // Some callers of synchronous messages wants a context to be passed back
 // in order to identify the call they made. Presumably one can make
 // multiple sync calls of same type (as async) and want to identify what
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index a8395d2..f4314ab 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.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.
 
@@ -500,7 +500,8 @@ class ChromeFrameAutomationClient
       const char* headers, int size, base::Time last_modified,
       const std::string& redirect_url, int redirect_status);
   virtual void OnReadComplete(int request_id, const std::string& data);
-  virtual void OnResponseEnd(int request_id, const URLRequestStatus& status);
+  virtual void OnResponseEnd(int request_id,
+                             const net::URLRequestStatus& status);
   virtual void OnCookiesRetrieved(bool success, const GURL& url,
       const std::string& cookie_string, int cookie_id);
 
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h
index 1a0f34b..1954747 100644
--- a/chrome_frame/chrome_frame_delegate.h
+++ b/chrome_frame/chrome_frame_delegate.h
@@ -1,9 +1,10 @@
-// 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
 #define CHROME_FRAME_CHROME_FRAME_DELEGATE_H_
+#pragma once
 
 #include <atlbase.h>
 #include <atlwin.h>
@@ -107,7 +108,8 @@ class ChromeFrameDelegateImpl : public ChromeFrameDelegate {
   virtual void OnRequestStart(
       int request_id, const AutomationURLRequest& request) {}
   virtual void OnRequestRead(int request_id, int bytes_to_read) {}
-  virtual void OnRequestEnd(int request_id, const URLRequestStatus& status) {}
+  virtual void OnRequestEnd(int request_id,
+                            const net::URLRequestStatus& status) {}
   virtual void OnDownloadRequestInHost(int request_id) {}
   virtual void OnSetCookieAsync(const GURL& url, const std::string& cookie) {}
   virtual void OnAttachExternalTab(
diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h
index 4fbb5d3..ac7aff3 100644
--- a/chrome_frame/external_tab.h
+++ b/chrome_frame/external_tab.h
@@ -22,14 +22,15 @@
 
 class Task;
 class CancelableTask;
+
 namespace base {
-  class TimeDelta;
-  class WaitableEvent;
+class TimeDelta;
+class WaitableEvent;
 }
 
 namespace IPC {
-  struct NavigationInfo;
-  struct MiniContextMenuParams;
+struct NavigationInfo;
+struct MiniContextMenuParams;
 }
 
 // This is the delegate/callback interface that has to be implemented
@@ -150,7 +151,7 @@ class ExternalTabProxy : public CWindowImpl<ExternalTabProxy>,
   virtual void OnNetwork_Start(
       int request_id, const AutomationURLRequest& request_info);
   virtual void OnNetwork_Read(int request_id, int bytes_to_read);
-  virtual void OnNetwork_End(int request_id, const URLRequestStatus& s);
+  virtual void OnNetwork_End(int request_id, const net::URLRequestStatus& s);
   virtual void OnNetwork_DownloadInHost(int request_id);
   virtual void OnGetCookies(const GURL& url, int cookie_id);
   virtual void OnSetCookie(const GURL& url, const std::string& cookie);
diff --git a/chrome_frame/npapi_url_request.h b/chrome_frame/npapi_url_request.h
index cce1b88..eace09d 100644
--- a/chrome_frame/npapi_url_request.h
+++ b/chrome_frame/npapi_url_request.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -56,7 +56,8 @@ class NPAPIUrlRequestManager : public PluginUrlRequestManager,
       const char* headers, int size, base::Time last_modified,
       const std::string& redirect_url, int redirect_status);
   virtual void OnReadComplete(int request_id, const std::string& data);
-  virtual void OnResponseEnd(int request_id, const URLRequestStatus& status);
+  virtual void OnResponseEnd(int request_id,
+                             const net::URLRequestStatus& status);
   virtual void OnCookiesRetrieved(bool success, const GURL& url,
       const std::string& cookie_string, int cookie_id);
 
diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h
index a39cf7d..cc9a17a 100644
--- a/chrome_frame/plugin_url_request.h
+++ b/chrome_frame/plugin_url_request.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -29,7 +29,7 @@ class DECLSPEC_NOVTABLE PluginUrlRequestDelegate {  // NOLINT
     const std::string& redirect_url, int redirect_status) = 0;
   virtual void OnReadComplete(int request_id, const std::string& data) = 0;
   virtual void OnResponseEnd(int request_id,
-                             const URLRequestStatus& status) = 0;
+                             const net::URLRequestStatus& status) = 0;
   virtual void AddPrivacyDataForUrl(const std::string& url,
                                     const std::string& policy_ref,
                                     int32 flags) {}
@@ -77,7 +77,7 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
     ReadRequest(request_id, bytes_to_read);
   }
 
-  void EndUrlRequest(int request_id, const URLRequestStatus& s) {
+  void EndUrlRequest(int request_id, const net::URLRequestStatus& s) {
     EndRequest(request_id);
   }
 
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 4a25b10c..39d2f32 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -1,6 +1,7 @@
-// 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.
+
 #ifndef CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
 #define CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
 
@@ -53,7 +54,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
       const AutomationURLRequest& request));
   MOCK_METHOD2(OnRequestRead, void(int request_id, int bytes_to_read));
   MOCK_METHOD2(OnRequestEnd, void(int request_id,
-      const URLRequestStatus& status));
+      const net::URLRequestStatus& status));
   MOCK_METHOD2(OnSetCookieAsync, void(const GURL& url,
       const std::string& cookie));
 
@@ -71,13 +72,13 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
     request_delegate_->OnReadComplete(request_id, *data);
   }
 
-  void Reply(const URLRequestStatus& status, int request_id) {
+  void Reply(const net::URLRequestStatus& status, int request_id) {
     request_delegate_->OnResponseEnd(request_id, status);
   }
 
   void Reply404(int request_id) {
     ReplyStarted(request_id, "HTTP/1.1 404\r\n\r\n");
-    Reply(URLRequestStatus(), request_id);
+    Reply(net::URLRequestStatus(), request_id);
   }
 
   PluginUrlRequestDelegate* request_delegate_;
@@ -180,6 +181,4 @@ class CFACMockTest : public testing::Test {
   }
 };
 
-
 #endif  // CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
-
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index a0c9605..4c60dcb 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -97,7 +97,8 @@ class UrlmonUrlRequestManager
                                  const std::string& redirect_url,
                                  int redirect_status);
   virtual void OnReadComplete(int request_id, const std::string& data);
-  virtual void OnResponseEnd(int request_id, const URLRequestStatus& status);
+  virtual void OnResponseEnd(int request_id,
+                             const net::URLRequestStatus& status);
   virtual void OnCookiesRetrieved(bool success, const GURL& url,
                                   const std::string& cookie_string,
                                   int cookie_id);
diff --git a/chrome_frame/urlmon_url_request_private.h b/chrome_frame/urlmon_url_request_private.h
index ebe027c..90068bd 100644
--- a/chrome_frame/urlmon_url_request_private.h
+++ b/chrome_frame/urlmon_url_request_private.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.
 
@@ -164,7 +164,7 @@ class UrlmonUrlRequest
     // Assumes binding_->Abort() will be called!
     void SetRedirected(int http_code, const std::string& utf8_url) {
       DCHECK_EQ(state_, WORKING);
-      DCHECK_EQ(result_.status(), URLRequestStatus::SUCCESS);
+      DCHECK_EQ(result_.status(), net::URLRequestStatus::SUCCESS);
       redirect_.utf8_url = utf8_url;
 
       // At times we receive invalid redirect codes like 0, 200, etc. We
@@ -176,7 +176,7 @@ class UrlmonUrlRequest
       state_ = ABORTING;
     }
 
-    // Set the result as URLRequestStatus::CANCELED.
+    // Set the result as net::URLRequestStatus::CANCELED.
     // Switch to [ABORTING] state (if not already in that state).
     void Cancel() {
       if (state_ == DONE)
@@ -190,7 +190,7 @@ class UrlmonUrlRequest
         redirect_.utf8_url.clear();
       }
 
-      set_result(URLRequestStatus::CANCELED, 0);
+      set_result(net::URLRequestStatus::CANCELED, 0);
     }
 
     void Done() {
@@ -205,25 +205,25 @@ class UrlmonUrlRequest
       return redirect_;
     }
 
-    const URLRequestStatus& get_result() const {
+    const net::URLRequestStatus& get_result() const {
       return result_;
     }
 
-    void set_result(URLRequestStatus::Status status, int os_error) {
+    void set_result(net::URLRequestStatus::Status status, int os_error) {
       result_.set_status(status);
       result_.set_os_error(os_error);
     }
 
     void set_result(HRESULT hr) {
-      result_.set_status(FAILED(hr)? URLRequestStatus::FAILED:
-                                     URLRequestStatus::SUCCESS);
+      result_.set_status(FAILED(hr)? net::URLRequestStatus::FAILED:
+                                     net::URLRequestStatus::SUCCESS);
       result_.set_os_error(HresultToNetError(hr));
     }
 
    private:
     Redirection redirect_;
     State state_;
-    URLRequestStatus result_;
+    net::URLRequestStatus result_;
   };
 
   Status status_;