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

73 files changed, 251 insertions, 214 deletions

diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h
index 785f34a..7f573dd 100644
--- a/chrome/browser/alternate_nav_url_fetcher.h
+++ b/chrome/browser/alternate_nav_url_fetcher.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.
 
@@ -51,7 +51,7 @@ class AlternateNavURLFetcher : public NotificationObserver,
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
@@ -67,7 +67,7 @@ class AlternateNavURLFetcher : public NotificationObserver,
   // Sets |state_| to either SUCCEEDED or FAILED depending on the result of the
   // fetch.
   void SetStatusFromURLFetch(const GURL& url,
-                             const URLRequestStatus& status,
+                             const net::URLRequestStatus& status,
                              int response_code);
 
   // Displays the infobar if all conditions are met (the page has loaded and
diff --git a/chrome/browser/appcache/appcache_dispatcher_host.h b/chrome/browser/appcache/appcache_dispatcher_host.h
index 3e2dbe9..1feca77 100644
--- a/chrome/browser/appcache/appcache_dispatcher_host.h
+++ b/chrome/browser/appcache/appcache_dispatcher_host.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.
 
@@ -18,9 +18,12 @@
 #include "webkit/appcache/appcache_backend_impl.h"
 
 class ChromeAppCacheService;
-class URLRequestContext;
 class URLRequestContextGetter;
 
+namespace net {
+class URLRequestContext;
+}  // namespace net
+
 // Handles appcache related messages sent to the main browser process from
 // its child processes. There is a distinct host for each child process.
 // Messages are handled on the IO thread. The BrowserRenderProcessHost and
@@ -28,7 +31,7 @@ class URLRequestContextGetter;
 class AppCacheDispatcherHost : public BrowserMessageFilter {
  public:
   // Constructor for use on the IO thread.
-  AppCacheDispatcherHost(URLRequestContext* request_context,
+  AppCacheDispatcherHost(net::URLRequestContext* request_context,
                          int process_id);
 
   // Constructor for use on the UI thread.
@@ -77,7 +80,7 @@ class AppCacheDispatcherHost : public BrowserMessageFilter {
 
   // Temporary until OnChannelConnected() can be called from the IO thread,
   // which will extract the AppCacheService from the URLRequestContext.
-  scoped_refptr<URLRequestContext> request_context_;
+  scoped_refptr<net::URLRequestContext> request_context_;
   scoped_refptr<URLRequestContextGetter> request_context_getter_;
 
   scoped_ptr<appcache::GetStatusCallback> get_status_callback_;
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index 2163336..9b83c3d 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -70,7 +70,7 @@ class SearchProvider : public AutocompleteProvider,
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index 94d9129..cc7e119 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -188,12 +188,13 @@ bool AutoFillDownloadManager::StartRequest(
   return true;
 }
 
-void AutoFillDownloadManager::OnURLFetchComplete(const URLFetcher* source,
-                                                 const GURL& url,
-                                                 const URLRequestStatus& status,
-                                                 int response_code,
-                                                 const ResponseCookies& cookies,
-                                                 const std::string& data) {
+void AutoFillDownloadManager::OnURLFetchComplete(
+    const URLFetcher* source,
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const ResponseCookies& cookies,
+    const std::string& data) {
   std::map<URLFetcher *, FormRequestData>::iterator it =
       url_fetchers_.find(const_cast<URLFetcher*>(source));
   if (it == url_fetchers_.end()) {
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index 488c3b3..8937557 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.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.
 
@@ -109,7 +109,7 @@ class AutoFillDownloadManager : public URLFetcher::Delegate {
   // URLFetcher::Delegate implementation:
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index 9256a77..f1e1aa1 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.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.
 // This class simulates what wininet does when a dns lookup fails.
@@ -83,7 +83,7 @@ class URLRequestAutomationJob : public net::URLRequestJob {
   // IPC message handlers.
   void OnRequestStarted(int id, const AutomationURLResponse& response);
   void OnDataAvailable(int id, const std::string& bytes);
-  void OnRequestEnd(int id, const URLRequestStatus& status);
+  void OnRequestEnd(int id, const net::URLRequestStatus& status);
 
  private:
   virtual ~URLRequestAutomationJob();
diff --git a/chrome/browser/chrome_plugin_browsing_context.cc b/chrome/browser/chrome_plugin_browsing_context.cc
index 3ff4729..a252bbf 100644
--- a/chrome/browser/chrome_plugin_browsing_context.cc
+++ b/chrome/browser/chrome_plugin_browsing_context.cc
@@ -23,17 +23,18 @@ CPBrowsingContextManager::~CPBrowsingContextManager() {
 }
 
 CPBrowsingContext CPBrowsingContextManager::Allocate(
-    URLRequestContext* context) {
+    net::URLRequestContext* context) {
   int32 map_id = map_.Add(context);
   return static_cast<CPBrowsingContext>(map_id);
 }
 
-URLRequestContext* CPBrowsingContextManager::ToURLRequestContext(
+net::URLRequestContext* CPBrowsingContextManager::ToURLRequestContext(
     CPBrowsingContext id) {
   return map_.Lookup(static_cast<int32>(id));
 }
 
-CPBrowsingContext CPBrowsingContextManager::Lookup(URLRequestContext* context) {
+CPBrowsingContext CPBrowsingContextManager::Lookup(
+    net::URLRequestContext* context) {
   ReverseMap::const_iterator it = reverse_map_.find(context);
   if (it == reverse_map_.end()) {
     CPBrowsingContext id = Allocate(context);
@@ -49,7 +50,8 @@ void CPBrowsingContextManager::Observe(NotificationType type,
                                        const NotificationDetails& details) {
   DCHECK(type == NotificationType::URL_REQUEST_CONTEXT_RELEASED);
 
-  URLRequestContext* context = Source<URLRequestContext>(source).ptr();
+  net::URLRequestContext* context =
+      Source<net::URLRequestContext>(source).ptr();
 
   // Multiple CPBrowsingContexts may refer to the same URLRequestContext.
   for (Map::iterator it(&map_); !it.IsAtEnd(); it.Advance()) {
diff --git a/chrome/browser/chrome_plugin_browsing_context.h b/chrome/browser/chrome_plugin_browsing_context.h
index 45d24f3..9f0eb8f 100644
--- a/chrome/browser/chrome_plugin_browsing_context.h
+++ b/chrome/browser/chrome_plugin_browsing_context.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -13,7 +13,9 @@
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
+namespace net {
 class URLRequestContext;
+}  // namespace net
 
 // This class manages the mapping between CPBrowsingContexts and
 // URLRequestContexts.  It observes when URLRequestContexts go away, and
@@ -33,16 +35,16 @@ class CPBrowsingContextManager : public NotificationObserver {
   // Generate a new unique CPBrowsingContext ID from the given
   // URLRequestContext.  Multiple CPBrowsingContexts can map to the same
   // URLRequestContext.
-  CPBrowsingContext Allocate(URLRequestContext* context);
+  CPBrowsingContext Allocate(net::URLRequestContext* context);
 
   // Return the URLRequestContext that this CPBrowsingContext refers to, or NULL
   // if not found.
-  URLRequestContext* ToURLRequestContext(CPBrowsingContext id);
+  net::URLRequestContext* ToURLRequestContext(CPBrowsingContext id);
 
   // Return a CPBrowsingContext ID that corresponds to the given
   // URLRequestContext. This function differs from Allocate in that calling
   // this multiple times with the same argument gives the same ID.
-  CPBrowsingContext Lookup(URLRequestContext* context);
+  CPBrowsingContext Lookup(net::URLRequestContext* context);
 
  private:
   // NotificationObserver
@@ -50,8 +52,8 @@ class CPBrowsingContextManager : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  typedef IDMap<URLRequestContext> Map;
-  typedef std::map<URLRequestContext*, CPBrowsingContext> ReverseMap;
+  typedef IDMap<net::URLRequestContext> Map;
+  typedef std::map<net::URLRequestContext*, CPBrowsingContext> ReverseMap;
 
   NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/chromeos/login/apply_services_customization.cc b/chrome/browser/chromeos/login/apply_services_customization.cc
index b778a5e..58e8e1d 100644
--- a/chrome/browser/chromeos/login/apply_services_customization.cc
+++ b/chrome/browser/chromeos/login/apply_services_customization.cc
@@ -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.
 
@@ -104,7 +104,7 @@ void ApplyServicesCustomization::StartFileFetch() {
 void ApplyServicesCustomization::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
-    const URLRequestStatus& status,
+    const net::URLRequestStatus& status,
     int response_code,
     const ResponseCookies& cookies,
     const std::string& data) {
diff --git a/chrome/browser/chromeos/login/apply_services_customization.h b/chrome/browser/chromeos/login/apply_services_customization.h
index 32e7d9a..757ce7c 100644
--- a/chrome/browser/chromeos/login/apply_services_customization.h
+++ b/chrome/browser/chromeos/login/apply_services_customization.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.
 
@@ -43,7 +43,7 @@ class ApplyServicesCustomization : public URLFetcher::Delegate {
   // Overriden from URLFetcher::Delegate:
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/chromeos/login/cookie_fetcher.h b/chrome/browser/chromeos/login/cookie_fetcher.h
index 660a1642..f9290f7 100644
--- a/chrome/browser/chromeos/login/cookie_fetcher.h
+++ b/chrome/browser/chromeos/login/cookie_fetcher.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 CookieFetcher : public URLFetcher::Delegate {
   // Overloaded from URLFetcher::Delegate.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc
index 943b9e9..4a6c0b5 100644
--- a/chrome/browser/chromeos/login/image_downloader.cc
+++ b/chrome/browser/chromeos/login/image_downloader.cc
@@ -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.
 
@@ -40,7 +40,7 @@ ImageDownloader::ImageDownloader(ImageDecoder::Delegate* delegate,
 
 void ImageDownloader::OnURLFetchComplete(const URLFetcher* source,
                                          const GURL& url,
-                                         const URLRequestStatus& status,
+                                         const net::URLRequestStatus& status,
                                          int response_code,
                                          const ResponseCookies& cookies,
                                          const std::string& data) {
diff --git a/chrome/browser/chromeos/login/image_downloader.h b/chrome/browser/chromeos/login/image_downloader.h
index 06193bf..31ab2a7 100644
--- a/chrome/browser/chromeos/login/image_downloader.h
+++ b/chrome/browser/chromeos/login/image_downloader.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.
 
@@ -31,7 +31,7 @@ class ImageDownloader : public URLFetcher::Delegate {
   // Overriden from URLFetcher::Delegate:
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/chromeos/login/mock_auth_response_handler.h b/chrome/browser/chromeos/login/mock_auth_response_handler.h
index db4651a..7b82cb8 100644
--- a/chrome/browser/chromeos/login/mock_auth_response_handler.h
+++ b/chrome/browser/chromeos/login/mock_auth_response_handler.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.
 
@@ -28,7 +28,7 @@ namespace chromeos {
 class MockAuthResponseHandler : public AuthResponseHandler {
  public:
   MockAuthResponseHandler(const GURL& url,
-                          const URLRequestStatus& status,
+                          const net::URLRequestStatus& status,
                           const int code,
                           const std::string& data);
   virtual ~MockAuthResponseHandler() {}
@@ -41,13 +41,13 @@ class MockAuthResponseHandler : public AuthResponseHandler {
 
  private:
   const GURL remote_;
-  const URLRequestStatus status_;
+  const net::URLRequestStatus status_;
   const int http_response_code_;
   const std::string data_;
 
   static void CompleteFetch(URLFetcher::Delegate* delegate,
                             const GURL remote,
-                            const URLRequestStatus status,
+                            const net::URLRequestStatus status,
                             const int http_response_code,
                             const std::string data);
 
diff --git a/chrome/browser/chromeos/login/user_image_downloader.cc b/chrome/browser/chromeos/login/user_image_downloader.cc
index 2efa796..b3da66a 100644
--- a/chrome/browser/chromeos/login/user_image_downloader.cc
+++ b/chrome/browser/chromeos/login/user_image_downloader.cc
@@ -57,12 +57,13 @@ UserImageDownloader::UserImageDownloader(const std::string& username,
 UserImageDownloader::~UserImageDownloader() {
 }
 
-void UserImageDownloader::OnURLFetchComplete(const URLFetcher* source,
-                                             const GURL& url,
-                                             const URLRequestStatus& status,
-                                             int response_code,
-                                             const ResponseCookies& cookies,
-                                             const std::string& data) {
+void UserImageDownloader::OnURLFetchComplete(
+    const URLFetcher* source,
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const ResponseCookies& cookies,
+    const std::string& data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (response_code != 200) {
     LOG(ERROR) << "Response code is " << response_code;
diff --git a/chrome/browser/chromeos/login/user_image_downloader.h b/chrome/browser/chromeos/login/user_image_downloader.h
index 5eba206..d5dacc4 100644
--- a/chrome/browser/chromeos/login/user_image_downloader.h
+++ b/chrome/browser/chromeos/login/user_image_downloader.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.
 
@@ -37,7 +37,7 @@ class UserImageDownloader : public URLFetcher::Delegate,
   // Overriden from URLFetcher::Delegate:
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index d9e6a3e..3d7986c 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -204,18 +204,18 @@ class ExtensionUpdater
   // URLFetcher::Delegate interface.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
 
   // These do the actual work when a URL fetch completes.
   virtual void OnManifestFetchComplete(const GURL& url,
-                                       const URLRequestStatus& status,
+                                       const net::URLRequestStatus& status,
                                        int response_code,
                                        const std::string& data);
   virtual void OnCRXFetchComplete(const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const std::string& data);
 
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.h b/chrome/browser/file_system/file_system_dispatcher_host.h
index ab57d09..865ef70 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.h
+++ b/chrome/browser/file_system/file_system_dispatcher_host.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,12 @@ class HostContentSettingsMap;
 class Profile;
 class Receiver;
 class RenderMessageFilter;
-class URLRequestContext;
 class URLRequestContextGetter;
 
+namespace net {
+class URLRequestContext;
+}  // namespace net
+
 namespace fileapi {
 class SandboxedFileSystemContext;
 class SandboxedFileSystemOperation;
@@ -93,7 +96,7 @@ class FileSystemDispatcherHost : public BrowserMessageFilter {
   // This holds the URLRequestContextGetter until Init() can be called from the
   // IO thread, which will extract the URLRequestContext from it.
   scoped_refptr<URLRequestContextGetter> request_context_getter_;
-  scoped_refptr<URLRequestContext> request_context_;
+  scoped_refptr<net::URLRequestContext> request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcherHost);
 };
diff --git a/chrome/browser/geolocation/network_location_request.h b/chrome/browser/geolocation/network_location_request.h
index f7c8a0c..90bc026 100644
--- a/chrome/browser/geolocation/network_location_request.h
+++ b/chrome/browser/geolocation/network_location_request.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.
 
@@ -64,7 +64,7 @@ class NetworkLocationRequest : private URLFetcher::Delegate {
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index 590c6df..7f58ab1 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -108,7 +108,7 @@ class GoogleURLTracker : public URLFetcher::Delegate,
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher *source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc
index cc3411c..adcea0c 100644
--- a/chrome/browser/importer/toolbar_importer.cc
+++ b/chrome/browser/importer/toolbar_importer.cc
@@ -135,7 +135,7 @@ void Toolbar5Importer::Cancel() {
 void Toolbar5Importer::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
-    const URLRequestStatus& status,
+    const net::URLRequestStatus& status,
     int response_code,
     const ResponseCookies& cookies,
     const std::string& data) {
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index f83135a..e0b87e5 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.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.
 
@@ -54,7 +54,7 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer {
   // URLFetcher::Delegate method called back from the URLFetcher object.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                           const GURL& url,
-                          const URLRequestStatus& status,
+                          const net::URLRequestStatus& status,
                           int response_code,
                           const ResponseCookies& cookies,
                           const std::string& data);
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 1861dce..5e920cf 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.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.
 
@@ -71,7 +71,7 @@ class IntranetRedirectDetector : public URLFetcher::Delegate,
   // URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 2f47a42..3d34538 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.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.
 
@@ -21,7 +21,6 @@ class ChromeURLRequestContextGetter;
 class ListValue;
 class PrefService;
 class PrerenderInterceptor;
-class URLRequestContext;
 
 namespace chrome_browser_net {
 class ConnectInterceptor;
@@ -38,6 +37,7 @@ class HttpTransactionFactory;
 class ProxyScriptFetcher;
 class ProxyService;
 class SSLConfigService;
+class URLRequestContext;
 class URLSecurityManager;
 }  // namespace net
 
@@ -58,7 +58,7 @@ class IOThread : public BrowserProcessSubThread {
         proxy_script_fetcher_http_transaction_factory;
     scoped_ptr<net::URLSecurityManager> url_security_manager;
     ChromeNetworkDelegate network_delegate;
-    scoped_refptr<URLRequestContext> proxy_script_fetcher_context;
+    scoped_refptr<net::URLRequestContext> proxy_script_fetcher_context;
   };
 
   // |net_log| must either outlive the IOThread or be NULL.
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index fa15a12..a4bee94 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_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.
 
@@ -274,7 +274,7 @@ class MetricsService : public NotificationObserver,
   // completes (either successfully or with failure).
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 8d1377b..93f0e37 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.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.
 
@@ -45,7 +45,7 @@ class ChromeURLRequestContextFactory;
 //
 // All methods of this class must be called from the IO thread,
 // including the constructor and destructor.
-class ChromeURLRequestContext : public URLRequestContext {
+class ChromeURLRequestContext : public net::URLRequestContext {
  public:
   ChromeURLRequestContext();
 
@@ -214,7 +214,7 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
   // GetIOMessageLoopProxy however can be called from any thread.
   //
   // URLRequestContextGetter implementation.
-  virtual URLRequestContext* GetURLRequestContext();
+  virtual net::URLRequestContext* GetURLRequestContext();
   virtual net::CookieStore* GetCookieStore();
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
 
@@ -301,7 +301,7 @@ class ChromeURLRequestContextGetter : public URLRequestContextGetter,
   // NULL if not yet initialized. Otherwise, it is the URLRequestContext
   // instance that was lazilly created by GetURLRequestContext.
   // Access only from the IO thread.
-  scoped_refptr<URLRequestContext> url_request_context_;
+  scoped_refptr<net::URLRequestContext> url_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLRequestContextGetter);
 };
diff --git a/chrome/browser/net/connection_tester.h b/chrome/browser/net/connection_tester.h
index 1d206ac..dd6715d 100644
--- a/chrome/browser/net/connection_tester.h
+++ b/chrome/browser/net/connection_tester.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.
 
@@ -13,7 +13,9 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 
+namespace net {
 class URLRequestContext;
+}  // namespace net
 
 // ConnectionTester runs a suite of tests (also called "experiments"),
 // to try and discover why loading a particular URL is failing with an error
@@ -126,7 +128,7 @@ class ConnectionTester {
   // |delegate| is owned by the caller, and must remain valid for the lifetime
   // of ConnectionTester.
   ConnectionTester(Delegate* delegate,
-                   URLRequestContext* proxy_request_context);
+                   net::URLRequestContext* proxy_request_context);
 
   // Note that destruction cancels any in-progress tests.
   ~ConnectionTester();
@@ -172,7 +174,7 @@ class ConnectionTester {
   // of the list is the one currently in progress.
   ExperimentList remaining_experiments_;
 
-  const scoped_refptr<URLRequestContext> proxy_request_context_;
+  const scoped_refptr<net::URLRequestContext> proxy_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionTester);
 };
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h
index 32bf0d7..0240245 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.h
+++ b/chrome/browser/net/sdch_dictionary_fetcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -52,7 +52,7 @@ class SdchDictionaryFetcher : public URLFetcher::Delegate,
   // completes (either successfully or with failure).
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index f116119..09cccc7 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
@@ -295,7 +295,7 @@ void WebSocketExperimentTask::SaveResult() const {
 void WebSocketExperimentTask::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
-    const URLRequestStatus& status,
+    const net::URLRequestStatus& status,
     int response_code,
     const ResponseCookies& cookies,
     const std::string& data) {
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h b/chrome/browser/net/websocket_experiment/websocket_experiment_task.h
index c1fe41c..b23c0a0 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.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.
 //
@@ -147,7 +147,7 @@ class WebSocketExperimentTask : public URLFetcher::Delegate,
   // URLFetcher::Delegate method.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/plugin_download_helper.cc b/chrome/browser/plugin_download_helper.cc
index 0d85e27..e9d306c 100644
--- a/chrome/browser/plugin_download_helper.cc
+++ b/chrome/browser/plugin_download_helper.cc
@@ -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.
 
@@ -34,7 +34,7 @@ PluginDownloadUrlHelper::~PluginDownloadUrlHelper() {
 }
 
 void PluginDownloadUrlHelper::InitiateDownload(
-    URLRequestContext* request_context) {
+    net::URLRequestContext* request_context) {
   download_file_request_ = new net::URLRequest(GURL(download_url_), this);
   chrome_browser_net::SetOriginProcessUniqueIDForRequest(
       download_source_child_unique_id_, download_file_request_);
diff --git a/chrome/browser/plugin_download_helper.h b/chrome/browser/plugin_download_helper.h
index cccf3f0..63b24be 100644
--- a/chrome/browser/plugin_download_helper.h
+++ b/chrome/browser/plugin_download_helper.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.
 
@@ -36,7 +36,7 @@ class PluginDownloadUrlHelper : public net::URLRequest::Delegate {
                           PluginDownloadUrlHelper::DownloadDelegate* delegate);
   ~PluginDownloadUrlHelper();
 
-  void InitiateDownload(URLRequestContext* request_context);
+  void InitiateDownload(net::URLRequestContext* request_context);
 
   // net::URLRequest::Delegate
   virtual void OnAuthRequired(net::URLRequest* request,
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index 8494fda..d24c4e2 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_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.
 
@@ -40,8 +40,10 @@ class Message;
 class MessageLoop;
 class Profile;
 class ResourceDispatcherHost;
-class URLRequestContext;
 
+namespace net {
+class URLRequestContext;
+}  // namespace net
 
 namespace webkit {
 namespace npapi {
diff --git a/chrome/browser/policy/device_management_service.h b/chrome/browser/policy/device_management_service.h
index eab4c21..76a3520 100644
--- a/chrome/browser/policy/device_management_service.h
+++ b/chrome/browser/policy/device_management_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.
 
@@ -34,10 +34,10 @@ class DeviceManagementService : public URLFetcher::Delegate {
     virtual ~DeviceManagementJob() {}
 
     // Handles the URL request response.
-    virtual void HandleResponse(const URLRequestStatus& status,
-                        int response_code,
-                        const ResponseCookies& cookies,
-                        const std::string& data) = 0;
+    virtual void HandleResponse(const net::URLRequestStatus& status,
+                                int response_code,
+                                const ResponseCookies& cookies,
+                                const std::string& data) = 0;
 
     // Gets the URL to contact.
     virtual GURL GetURL(const std::string& server_url) = 0;
@@ -79,7 +79,7 @@ class DeviceManagementService : public URLFetcher::Delegate {
   // URLFetcher::Delegate override.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/remoting/directory_add_request.h b/chrome/browser/remoting/directory_add_request.h
index 2ec6ed2..c87cbf2 100644
--- a/chrome/browser/remoting/directory_add_request.h
+++ b/chrome/browser/remoting/directory_add_request.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.
 
@@ -55,7 +55,7 @@ class DirectoryAddRequest : public URLFetcher::Delegate {
   // URLFetcher::Delegate implementation.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/renderer_host/async_resource_handler.h b/chrome/browser/renderer_host/async_resource_handler.h
index 2b0df7d..d5fa704 100644
--- a/chrome/browser/renderer_host/async_resource_handler.h
+++ b/chrome/browser/renderer_host/async_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -33,7 +33,7 @@ class AsyncResourceHandler : public ResourceHandler {
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
   virtual void OnDataDownloaded(int request_id, int bytes_downloaded);
diff --git a/chrome/browser/renderer_host/buffered_resource_handler.h b/chrome/browser/renderer_host/buffered_resource_handler.h
index 05cbd48..029db3f 100644
--- a/chrome/browser/renderer_host/buffered_resource_handler.h
+++ b/chrome/browser/renderer_host/buffered_resource_handler.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.
 
@@ -34,7 +34,7 @@ class BufferedResourceHandler : public ResourceHandler {
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/cross_site_resource_handler.h b/chrome/browser/renderer_host/cross_site_resource_handler.h
index 33c1109..00006bf 100644
--- a/chrome/browser/renderer_host/cross_site_resource_handler.h
+++ b/chrome/browser/renderer_host/cross_site_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -35,7 +35,7 @@ class CrossSiteResourceHandler : public ResourceHandler {
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
@@ -60,7 +60,7 @@ class CrossSiteResourceHandler : public ResourceHandler {
   bool in_cross_site_transition_;
   int request_id_;
   bool completed_during_transition_;
-  URLRequestStatus completed_status_;
+  net::URLRequestStatus completed_status_;
   std::string completed_security_info_;
   ResourceResponse* response_;
   ResourceDispatcherHost* rdh_;
diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h
index 5a66f66..bc26989 100644
--- a/chrome/browser/renderer_host/download_resource_handler.h
+++ b/chrome/browser/renderer_host/download_resource_handler.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.
 
@@ -56,7 +56,7 @@ class DownloadResourceHandler : public ResourceHandler,
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
 
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.h b/chrome/browser/renderer_host/download_throttling_resource_handler.h
index 22de040..355bee1 100644
--- a/chrome/browser/renderer_host/download_throttling_resource_handler.h
+++ b/chrome/browser/renderer_host/download_throttling_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -51,7 +51,7 @@ class DownloadThrottlingResourceHandler
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/offline_resource_handler.h b/chrome/browser/renderer_host/offline_resource_handler.h
index eb19072..82f15a9 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.h
+++ b/chrome/browser/renderer_host/offline_resource_handler.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.
 
@@ -40,7 +40,7 @@ class OfflineResourceHandler : public ResourceHandler,
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/redirect_to_file_resource_handler.h b/chrome/browser/renderer_host/redirect_to_file_resource_handler.h
index 5e8624a..2d7ceed 100644
--- a/chrome/browser/renderer_host/redirect_to_file_resource_handler.h
+++ b/chrome/browser/renderer_host/redirect_to_file_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -44,7 +44,7 @@ class RedirectToFileResourceHandler : public ResourceHandler {
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index b48d906..cbd62c2 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.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.
 
@@ -42,13 +42,16 @@ class SafeBrowsingService;
 class SaveFileManager;
 class SSLClientAuthHandler;
 class UserScriptListener;
-class URLRequestContext;
 class WebKitThread;
 struct DownloadSaveInfo;
 struct GlobalRequestID;
 struct ViewHostMsg_Resource_Request;
 struct ViewMsg_ClosePage_Params;
 
+namespace net {
+class URLRequestContext;
+}  // namespace net
+
 namespace webkit_blob {
 class DeletableFileReference;
 }
@@ -91,7 +94,7 @@ class ResourceDispatcherHost : public net::URLRequest::Delegate {
                      bool prompt_for_save_location,
                      int process_unique_id,
                      int route_id,
-                     URLRequestContext* request_context);
+                     net::URLRequestContext* request_context);
 
   // Initiates a save file from the browser process (as opposed to a resource
   // request from the renderer or another child process).
@@ -99,7 +102,7 @@ class ResourceDispatcherHost : public net::URLRequest::Delegate {
                      const GURL& referrer,
                      int process_unique_id,
                      int route_id,
-                     URLRequestContext* request_context);
+                     net::URLRequestContext* request_context);
 
   // Cancels the given request if it still exists. We ignore cancels from the
   // renderer in the event of a download.
diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h
index bc05b17..c231406 100644
--- a/chrome/browser/renderer_host/resource_handler.h
+++ b/chrome/browser/renderer_host/resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -19,11 +19,11 @@
 
 namespace net {
 class IOBuffer;
-}
+class URLRequestStatus;
+}  // namespace net
 
 struct ResourceResponse;
 class GURL;
-class URLRequestStatus;
 
 // The resource dispatcher host uses this interface to push load events to the
 // renderer, allowing for differences in the types of IPC messages generated.
@@ -73,7 +73,7 @@ class ResourceHandler
   // The response is complete.  The final response status is given.
   // Returns false if the handler is deferring the call to a later time.
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info) = 0;
 
   // Signals that the request is closed (i.e. finished successfully, cancelled).
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 69af8a9..471c60a 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.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.
 
@@ -12,7 +12,10 @@
 
 class ChromeURLRequestContext;
 class ResourceDispatcherHost;
+
+namespace net {
 class URLRequestContext;
+}  // namespace net
 
 // This class filters out incoming IPC messages for network requests and
 // processes them on the IPC thread.  As a result, network requests are not
@@ -27,7 +30,7 @@ class ResourceMessageFilter : public BrowserMessageFilter {
    public:
     URLRequestContextOverride() {}
 
-    virtual URLRequestContext* GetRequestContext(
+    virtual net::URLRequestContext* GetRequestContext(
         uint32 request_id, ResourceType::Type resource_type) = 0;
 
    protected:
diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h
index 49f716d..f11a77a 100644
--- a/chrome/browser/renderer_host/resource_request_details.h
+++ b/chrome/browser/renderer_host/resource_request_details.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.
 
@@ -36,7 +36,7 @@ class ResourceRequestDetails {
   bool has_upload() const { return has_upload_; }
   int load_flags() const { return load_flags_; }
   int origin_child_id() const { return origin_child_id_; }
-  const URLRequestStatus& status() const { return status_; }
+  const net::URLRequestStatus& status() const { return status_; }
   int ssl_cert_id() const { return ssl_cert_id_; }
   int ssl_cert_status() const { return ssl_cert_status_; }
   ResourceType::Type resource_type() const { return resource_type_; }
@@ -51,7 +51,7 @@ class ResourceRequestDetails {
   bool has_upload_;
   int load_flags_;
   int origin_child_id_;
-  URLRequestStatus status_;
+  net::URLRequestStatus status_;
   int ssl_cert_id_;
   int ssl_cert_status_;
   ResourceType::Type resource_type_;
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.h b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
index 724297f..723a32b 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_handler.h
+++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -58,7 +58,7 @@ class SafeBrowsingResourceHandler : public ResourceHandler,
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/save_file_resource_handler.h b/chrome/browser/renderer_host/save_file_resource_handler.h
index 7475bef..3519eb1 100644
--- a/chrome/browser/renderer_host/save_file_resource_handler.h
+++ b/chrome/browser/renderer_host/save_file_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -44,7 +44,7 @@ class SaveFileResourceHandler : public ResourceHandler {
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
 
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
 
   virtual void OnRequestClosed();
diff --git a/chrome/browser/renderer_host/socket_stream_dispatcher_host.h b/chrome/browser/renderer_host/socket_stream_dispatcher_host.h
index b57d7ce..5c1b47ce 100644
--- a/chrome/browser/renderer_host/socket_stream_dispatcher_host.h
+++ b/chrome/browser/renderer_host/socket_stream_dispatcher_host.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.
 
@@ -54,7 +54,7 @@ class SocketStreamDispatcherHost : public BrowserMessageFilter,
   void DeleteSocketStreamHost(int socket_id);
 
   // Returns the URLRequestContext.
-  URLRequestContext* GetURLRequestContext();
+  net::URLRequestContext* GetURLRequestContext();
 
   IDMap<SocketStreamHost> hosts_;
   scoped_refptr<ResourceMessageFilter::URLRequestContextOverride>
diff --git a/chrome/browser/renderer_host/socket_stream_host.h b/chrome/browser/renderer_host/socket_stream_host.h
index 06b3e9f..50afad2 100644
--- a/chrome/browser/renderer_host/socket_stream_host.h
+++ b/chrome/browser/renderer_host/socket_stream_host.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.
 
@@ -12,11 +12,11 @@
 #include "net/socket_stream/socket_stream.h"
 
 class GURL;
-class URLRequestContext;
 
 namespace net {
 class SocketStreamJob;
-}
+class URLRequestContext;
+}  // namespace net
 
 // Host of SocketStreamHandle.
 // Each SocketStreamHandle will have an unique socket_id assigned by
@@ -37,7 +37,7 @@ class SocketStreamHost {
   int socket_id() const { return socket_id_; }
 
   // Starts to open connection to |url|.
-  void Connect(const GURL& url, URLRequestContext* request_context);
+  void Connect(const GURL& url, net::URLRequestContext* request_context);
 
   // Sends |data| over the socket stream.
   // socket stream must be open to send data.
diff --git a/chrome/browser/renderer_host/sync_resource_handler.h b/chrome/browser/renderer_host/sync_resource_handler.h
index 174d1d8..d0e3d5c 100644
--- a/chrome/browser/renderer_host/sync_resource_handler.h
+++ b/chrome/browser/renderer_host/sync_resource_handler.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -40,7 +40,7 @@ class SyncResourceHandler : public ResourceHandler {
                           int min_size);
   virtual bool OnReadCompleted(int request_id, int* bytes_read);
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& status,
+                                   const net::URLRequestStatus& status,
                                    const std::string& security_info);
   virtual void OnRequestClosed();
 
diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
index 8ae25f8..1c20cce 100644
--- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
+++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.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.
 
@@ -14,10 +14,10 @@
 
 namespace net {
 class URLRequest;
+class URLRequestStatus;
 }  // namespace net
 
 class ResourceDispatcherHost;
-class URLRequestStatus;
 struct DownloadBuffer;
 
 // This class handles the "application/x-x509-user-cert" mime-type
@@ -51,7 +51,7 @@ class X509UserCertResourceHandler : public ResourceHandler {
 
   // Done downloading the certificate.
   virtual bool OnResponseCompleted(int request_id,
-                                   const URLRequestStatus& urs,
+                                   const net::URLRequestStatus& urs,
                                    const std::string& sec_info);
 
   virtual void OnRequestClosed();
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h
index 41c87f6..7e048e5 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.h
+++ b/chrome/browser/safe_browsing/client_side_detection_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.
 //
@@ -35,7 +35,10 @@
 
 class SkBitmap;
 class URLRequestContextGetter;
+
+namespace net {
 class URLRequestStatus;
+}  // namespace net
 
 namespace safe_browsing {
 
@@ -58,7 +61,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate {
   // From the URLFetcher::Delegate interface.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
@@ -149,7 +152,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate {
   // model.
   void HandleModelResponse(const URLFetcher* source,
                            const GURL& url,
-                           const URLRequestStatus& status,
+                           const net::URLRequestStatus& status,
                            int response_code,
                            const ResponseCookies& cookies,
                            const std::string& data);
@@ -158,7 +161,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate {
   // sending the client-side phishing request.
   void HandlePhishingVerdict(const URLFetcher* source,
                              const GURL& url,
-                             const URLRequestStatus& status,
+                             const net::URLRequestStatus& status,
                              int response_code,
                              const ResponseCookies& cookies,
                              const std::string& data);
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 173a496..7205b53 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.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.
 
@@ -27,7 +27,9 @@
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/net/url_fetcher.h"
 
+namespace net {
 class URLRequestStatus;
+}  // namespace net
 
 #if defined(COMPILER_GCC)
 // Allows us to use URLFetchers in a hash_map with gcc (MSVC is okay without
@@ -103,7 +105,7 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate {
   // URLFetcher::Delegate interface.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/speech/speech_recognition_request.h b/chrome/browser/speech/speech_recognition_request.h
index d6e9566..c12fc4d 100644
--- a/chrome/browser/speech/speech_recognition_request.h
+++ b/chrome/browser/speech/speech_recognition_request.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_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
+#pragma once
 
 #include <string>
 #include "base/basictypes.h"
@@ -55,7 +56,7 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate {
   // URLFetcher::Delegate methods.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc
index b2932b3..7a5ffa6 100644
--- a/chrome/browser/spellcheck_host.cc
+++ b/chrome/browser/spellcheck_host.cc
@@ -255,7 +255,7 @@ void SpellCheckHost::WriteWordToCustomDictionary(const std::string& word) {
 
 void SpellCheckHost::OnURLFetchComplete(const URLFetcher* source,
                                         const GURL& url,
-                                        const URLRequestStatus& status,
+                                        const net::URLRequestStatus& status,
                                         int response_code,
                                         const ResponseCookies& cookies,
                                         const std::string& data) {
diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h
index aad254a..1f09b35 100644
--- a/chrome/browser/spellcheck_host.h
+++ b/chrome/browser/spellcheck_host.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.
 
@@ -89,7 +89,7 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost,
   // spellcheck dictionary; saves the dictionary to |data_|.
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 30a4e22..5fb2419 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -41,13 +41,13 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
   // 2) avoids ifdefs for now
   // 3) not sure we want to strictly follow settings for cookie policy,
   //    accept lang/charset, since changing these could break syncing.
-  class RequestContext : public URLRequestContext {
+  class RequestContext : public net::URLRequestContext {
    public:
     // |baseline_context| is used to obtain the accept-language,
     // accept-charsets, and proxy service information for bridged requests.
     // Typically |baseline_context| should be the URLRequestContext of the
     // currently active profile.
-    explicit RequestContext(URLRequestContext* baseline_context);
+    explicit RequestContext(net::URLRequestContext* baseline_context);
 
     // Set the user agent for requests using this context. The default is
     // the browser's UA string.
@@ -57,7 +57,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
       // If the user agent is set explicitly return that, otherwise call the
       // base class method to return default value.
       return user_agent_.empty() ?
-          URLRequestContext::GetUserAgent(url) : user_agent_;
+          net::URLRequestContext::GetUserAgent(url) : user_agent_;
     }
 
    private:
@@ -65,7 +65,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
     ~RequestContext();
 
     std::string user_agent_;
-    URLRequestContext* baseline_context_;
+    net::URLRequestContext* baseline_context_;
 
     DISALLOW_COPY_AND_ASSIGN(RequestContext);
   };
@@ -80,7 +80,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
     bool is_user_agent_set() const { return !user_agent_.empty(); }
 
     // URLRequestContextGetter implementation.
-    virtual URLRequestContext* GetURLRequestContext();
+    virtual net::URLRequestContext* GetURLRequestContext();
     virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
 
    private:
@@ -117,8 +117,9 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
       const std::string& name) const;
 
   // URLFetcher::Delegate implementation.
-  virtual void OnURLFetchComplete(const URLFetcher* source, const GURL& url,
-                                  const URLRequestStatus& status,
+  virtual void OnURLFetchComplete(const URLFetcher* source,
+                                  const GURL& url,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/browser/task_manager/task_manager.h b/chrome/browser/task_manager/task_manager.h
index c0f757e..7117092 100644
--- a/chrome/browser/task_manager/task_manager.h
+++ b/chrome/browser/task_manager/task_manager.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.
 
@@ -300,7 +300,7 @@ class TaskManagerModel : public net::URLRequestJobTracker::JobObserver,
   virtual void OnJobAdded(net::URLRequestJob* job);
   virtual void OnJobRemoved(net::URLRequestJob* job);
   virtual void OnJobDone(net::URLRequestJob* job,
-                         const URLRequestStatus& status);
+                         const net::URLRequestStatus& status);
   virtual void OnJobRedirect(net::URLRequestJob* job,
                              const GURL& location,
                              int status_code);
diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h
index 48e1951..39d9df7 100644
--- a/chrome/browser/translate/translate_manager.h
+++ b/chrome/browser/translate/translate_manager.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.
 
@@ -66,7 +66,7 @@ class TranslateManager : public NotificationObserver,
   // URLFetcher::Delegate implementation:
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h
index 3638443..ad9c05a 100644
--- a/chrome/common/common_param_traits.h
+++ b/chrome/common/common_param_traits.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.
 
@@ -40,7 +40,6 @@ class SkBitmap;
 class DictionaryValue;
 class ListValue;
 struct ThumbnailScore;
-class URLRequestStatus;
 struct WebApplicationInfo;
 class WebCursor;
 
@@ -52,6 +51,7 @@ class Size;
 
 namespace net {
 class UploadData;
+class URLRequestStatus;
 }
 
 namespace printing {
diff --git a/chrome/common/extensions/extension_localization_peer.h b/chrome/common/extensions/extension_localization_peer.h
index 1274421..49881f2 100644
--- a/chrome/common/extensions/extension_localization_peer.h
+++ b/chrome/common/extensions/extension_localization_peer.h
@@ -1,8 +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_COMMON_EXTENSIONS_EXTENSION_LOCALIZATION_PEER_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_LOCALIZATION_PEER_H_
 #pragma once
@@ -42,7 +41,7 @@ class ExtensionLocalizationPeer
       bool content_filtered);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
-  virtual void OnCompletedRequest(const URLRequestStatus& status,
+  virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
                                   const base::Time& completion_time);
 
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.h b/chrome/common/net/gaia/gaia_auth_fetcher.h
index 1a1602d..4fde132 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.h
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.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.
 
@@ -76,7 +76,7 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
   // Implementation of URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
@@ -116,15 +116,15 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
 
   // Process the results of a ClientLogin fetch.
   void OnClientLoginFetched(const std::string& data,
-                            const URLRequestStatus& status,
+                            const net::URLRequestStatus& status,
                             int response_code);
 
   void OnIssueAuthTokenFetched(const std::string& data,
-                               const URLRequestStatus& status,
+                               const net::URLRequestStatus& status,
                                int response_code);
 
   void OnGetUserInfoFetched(const std::string& data,
-                            const URLRequestStatus& status,
+                            const net::URLRequestStatus& status,
                             int response_code);
 
   // Tokenize the results of a ClientLogin fetch.
@@ -144,7 +144,7 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
   // the same error returns.
   static GoogleServiceAuthError GenerateAuthError(
       const std::string& data,
-      const URLRequestStatus& status);
+      const net::URLRequestStatus& status);
 
   // Is this a special case Gaia error for TwoFactor auth?
   static bool IsSecondFactorSuccess(const std::string& alleged_error);
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index 924a6bc..733fd92 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.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.
 //
@@ -26,11 +26,11 @@ class GURL;
 typedef std::vector<std::string> ResponseCookies;
 class URLFetcher;
 class URLRequestContextGetter;
-class URLRequestStatus;
 
 namespace net {
 class HttpResponseHeaders;
-}
+class URLRequestStatus;
+}  // namespace net
 
 // To use this class, create an instance with the desired URL and a pointer to
 // the object to be notified when the URL has been loaded:
@@ -75,7 +75,7 @@ class URLFetcher {
     // URLFetcher instance is destroyed.
     virtual void OnURLFetchComplete(const URLFetcher* source,
                                     const GURL& url,
-                                    const URLRequestStatus& status,
+                                    const net::URLRequestStatus& status,
                                     int response_code,
                                     const ResponseCookies& cookies,
                                     const std::string& data) = 0;
diff --git a/chrome/common/net/url_request_context_getter.h b/chrome/common/net/url_request_context_getter.h
index ade5e1a..0c060e5 100644
--- a/chrome/common/net/url_request_context_getter.h
+++ b/chrome/common/net/url_request_context_getter.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.
 
@@ -15,9 +15,9 @@ class MessageLoopProxy;
 
 namespace net {
 class CookieStore;
+class URLRequestContext;
 }
 
-class URLRequestContext;
 struct URLRequestContextGetterTraits;
 
 // Interface for retrieving an URLRequestContext.
@@ -25,7 +25,7 @@ class URLRequestContextGetter
     : public base::RefCountedThreadSafe<URLRequestContextGetter,
                                         URLRequestContextGetterTraits> {
  public:
-  virtual URLRequestContext* GetURLRequestContext() = 0;
+  virtual net::URLRequestContext* GetURLRequestContext() = 0;
 
   // Defaults to GetURLRequestContext()->cookie_store(), but
   // implementations can override it.
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h
index 52c6589..823af81 100644
--- a/chrome/common/resource_dispatcher.h
+++ b/chrome/common/resource_dispatcher.h
@@ -1,11 +1,11 @@
-// 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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
-#ifndef CHROME_COMMON_RESOURCE_DISPATCHER_H__
-#define CHROME_COMMON_RESOURCE_DISPATCHER_H__
+#ifndef CHROME_COMMON_RESOURCE_DISPATCHER_H_
+#define CHROME_COMMON_RESOURCE_DISPATCHER_H_
 #pragma once
 
 #include <deque>
@@ -114,7 +114,7 @@ class ResourceDispatcher : public IPC::Channel::Listener {
       int data_len);
   void OnRequestComplete(
       int request_id,
-      const URLRequestStatus& status,
+      const net::URLRequestStatus& status,
       const std::string& security_info,
       const base::Time& completion_time);
 
@@ -149,4 +149,4 @@ class ResourceDispatcher : public IPC::Channel::Listener {
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
-#endif  // CHROME_COMMON_RESOURCE_DISPATCHER_H__
+#endif  // CHROME_COMMON_RESOURCE_DISPATCHER_H_
diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h
index e82f748..53d0559 100644
--- a/chrome/common/security_filter_peer.h
+++ b/chrome/common/security_filter_peer.h
@@ -1,10 +1,9 @@
-// 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_COMMON_SECURITY_FILTER_PEER_H__
-#define CHROME_COMMON_SECURITY_FILTER_PEER_H__
+#ifndef CHROME_COMMON_SECURITY_FILTER_PEER_H_
+#define CHROME_COMMON_SECURITY_FILTER_PEER_H_
 #pragma once
 
 #include "webkit/glue/resource_loader_bridge.h"
@@ -41,7 +40,7 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
       bool content_filtered);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
-  virtual void OnCompletedRequest(const URLRequestStatus& status,
+  virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
                                   const base::Time& completion_time);
 
@@ -70,7 +69,7 @@ class BufferedPeer : public SecurityFilterPeer {
       const webkit_glue::ResourceResponseInfo& info,
       bool content_filtered);
   virtual void OnReceivedData(const char* data, int len);
-  virtual void OnCompletedRequest(const URLRequestStatus& status,
+  virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
                                   const base::Time& completion_time);
 
@@ -111,7 +110,7 @@ class ReplaceContentPeer : public SecurityFilterPeer {
       const webkit_glue::ResourceResponseInfo& info,
       bool content_filtered);
   virtual void OnReceivedData(const char* data, int len);
-  virtual void OnCompletedRequest(const URLRequestStatus& status,
+  virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
                                   const base::Time& completion_time);
 
@@ -123,4 +122,4 @@ class ReplaceContentPeer : public SecurityFilterPeer {
   DISALLOW_COPY_AND_ASSIGN(ReplaceContentPeer);
 };
 
-#endif  // CHROME_COMMON_SECURITY_FILTER_PEER_H__
+#endif  // CHROME_COMMON_SECURITY_FILTER_PEER_H_
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index 5fc4fb1..850265e 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.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.
 
@@ -13,7 +13,10 @@
 
 class DictionaryValue;
 class GURL;
+
+namespace net {
 class URLRequestStatus;
+}  // namespace net
 
 // A wrapper around URLFetcher for CloudPrint. URLFetcher applies retry logic
 // only on HTTP response codes >= 500. In the cloud print case, we want to
@@ -36,12 +39,13 @@ class CloudPrintURLFetcher
     // error checking is done before this method is called. If the delegate
     // returns CONTINUE_PROCESSING, we will then check for network
     // errors. Most implementations will not override this.
-    virtual ResponseAction HandleRawResponse(const URLFetcher* source,
-                                             const GURL& url,
-                                             const URLRequestStatus& status,
-                                             int response_code,
-                                             const ResponseCookies& cookies,
-                                             const std::string& data) {
+    virtual ResponseAction HandleRawResponse(
+        const URLFetcher* source,
+        const GURL& url,
+        const net::URLRequestStatus& status,
+        int response_code,
+        const ResponseCookies& cookies,
+        const std::string& data) {
       return CONTINUE_PROCESSING;
     }
     // This will be invoked only if HandleRawResponse returns
@@ -87,7 +91,7 @@ class CloudPrintURLFetcher
 
   // URLFetcher::Delegate implementation.
   virtual void OnURLFetchComplete(const URLFetcher* source, const GURL& url,
-                                  const URLRequestStatus& status,
+                                  const net::URLRequestStatus& status,
                                   int response_code,
                                   const ResponseCookies& cookies,
                                   const std::string& data);
diff --git a/chrome/service/gaia/service_gaia_authenticator.cc b/chrome/service/gaia/service_gaia_authenticator.cc
index d6a1948..1f57626 100644
--- a/chrome/service/gaia/service_gaia_authenticator.cc
+++ b/chrome/service/gaia/service_gaia_authenticator.cc
@@ -72,9 +72,12 @@ void ServiceGaiaAuthenticator::DoPost(const GURL& post_url,
 
 // URLFetcher::Delegate implementation
 void ServiceGaiaAuthenticator::OnURLFetchComplete(
-    const URLFetcher *source, const GURL &url, const URLRequestStatus &status,
-    int response_code, const ResponseCookies &cookies,
-    const std::string &data) {
+    const URLFetcher* source,
+    const GURL& url,
+    const net::URLRequestStatus& status,
+    int response_code,
+    const ResponseCookies& cookies,
+    const std::string& data) {
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
   http_response_code_ = response_code;
   response_data_ = data;
diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h
index 5d2813a..14adcff 100644
--- a/chrome/service/gaia/service_gaia_authenticator.h
+++ b/chrome/service/gaia/service_gaia_authenticator.h
@@ -33,7 +33,7 @@ class ServiceGaiaAuthenticator
   // URLFetcher::Delegate implementation.
   virtual void OnURLFetchComplete(const URLFetcher *source,
                                   const GURL &url,
-                                  const URLRequestStatus &status,
+                                  const net::URLRequestStatus &status,
                                   int response_code,
                                   const ResponseCookies &cookies,
                                   const std::string &data);
diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h
index d1bb2bf..4e6e296 100644
--- a/chrome/service/net/service_url_request_context.h
+++ b/chrome/service/net/service_url_request_context.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.
 
@@ -29,7 +29,7 @@ class MessageLoopProxy;
 // for requests. This subclass is meant to be used in the service process where
 // the profile is not available.
 //
-class ServiceURLRequestContext : public URLRequestContext {
+class ServiceURLRequestContext : public net::URLRequestContext {
  public:
   explicit ServiceURLRequestContext(const std::string& user_agent);
   void set_cookie_policy(net::CookiePolicy* policy) {
@@ -50,7 +50,7 @@ class ServiceURLRequestContextGetter : public URLRequestContextGetter {
  public:
   ServiceURLRequestContextGetter();
 
-  virtual URLRequestContext* GetURLRequestContext();
+  virtual net::URLRequestContext* GetURLRequestContext();
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
 
   void set_user_agent(const std::string& ua) {
@@ -63,7 +63,7 @@ class ServiceURLRequestContextGetter : public URLRequestContextGetter {
   virtual ~ServiceURLRequestContextGetter();
 
   std::string user_agent_;
-  scoped_refptr<URLRequestContext> url_request_context_;
+  scoped_refptr<net::URLRequestContext> url_request_context_;
   scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
 };
 
diff --git a/chrome/test/automation/automation_proxy_uitest.h b/chrome/test/automation/automation_proxy_uitest.h
index 0b5556f..c08aa91 100644
--- a/chrome/test/automation/automation_proxy_uitest.h
+++ b/chrome/test/automation/automation_proxy_uitest.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.
 
@@ -45,7 +45,7 @@ class ExternalTabUITestMockClient : public AutomationProxy {
   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));
   MOCK_METHOD1(HandleClosed, void(int handle));
@@ -67,7 +67,9 @@ class ExternalTabUITestMockClient : public AutomationProxy {
                     int tab_handle, int request_id);
   void ReplyData(const std::string* data, int tab_handle, int request_id);
   void ReplyEOF(int tab_handle, int request_id);
-  void ReplyEnd(const URLRequestStatus& status, int tab_handle, int request_id);
+  void ReplyEnd(const net::URLRequestStatus& status,
+                int tab_handle,
+                int request_id);
   void Reply404(int tab_handle, int request_id);
 
   // Test setup helpers
diff --git a/chrome/test/test_url_request_context_getter.h b/chrome/test/test_url_request_context_getter.h
index 8ac7b05..61dc327 100644
--- a/chrome/test/test_url_request_context_getter.h
+++ b/chrome/test/test_url_request_context_getter.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_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_
 #define CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_
+#pragma once
 
 #include "base/ref_counted.h"
 #include "chrome/browser/browser_thread.h"
@@ -17,7 +18,7 @@
 // special trait that deletes it on the IO thread.
 class TestURLRequestContextGetter : public URLRequestContextGetter {
  public:
-  virtual URLRequestContext* GetURLRequestContext() {
+  virtual net::URLRequestContext* GetURLRequestContext() {
     if (!context_)
       context_ = new TestURLRequestContext();
     return context_.get();
@@ -27,7 +28,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
   }
 
  private:
-  scoped_refptr<URLRequestContext> context_;
+  scoped_refptr<net::URLRequestContext> context_;
 };
 
 #endif  // CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_