net: Remove typedef net::URLRequestJob URLRequestJob;

BUG=64263
TEST=compiled locally, trybots

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

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

76 files changed, 231 insertions, 220 deletions

diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.cc b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
index 685be40..99ef75f 100644
--- a/chrome/browser/appcache/view_appcache_internals_job_factory.cc
+++ b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
@@ -18,7 +18,7 @@ bool ViewAppCacheInternalsJobFactory::IsSupportedURL(const GURL& url) {
 }
 
 // static.
-URLRequestJob* ViewAppCacheInternalsJobFactory::CreateJobForRequest(
+net::URLRequestJob* ViewAppCacheInternalsJobFactory::CreateJobForRequest(
     net::URLRequest* request) {
   URLRequestContext* context = request->context();
   ChromeURLRequestContext* chrome_request_context =
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index 874d600..12fd431 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -51,7 +51,7 @@ URLRequestAutomationJob::URLRequestAutomationJob(
     int request_id,
     AutomationResourceMessageFilter* filter,
     bool is_pending)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       id_(0),
       tab_(tab),
       message_filter_(filter),
@@ -90,8 +90,9 @@ bool URLRequestAutomationJob::EnsureProtocolFactoryRegistered() {
   return true;
 }
 
-URLRequestJob* URLRequestAutomationJob::Factory(net::URLRequest* request,
-                                                const std::string& scheme) {
+net::URLRequestJob* URLRequestAutomationJob::Factory(
+    net::URLRequest* request,
+    const std::string& scheme) {
   bool scheme_is_http = request->url().SchemeIs("http");
   bool scheme_is_https = request->url().SchemeIs("https");
 
@@ -127,7 +128,7 @@ URLRequestJob* URLRequestAutomationJob::Factory(net::URLRequest* request,
   return NULL;
 }
 
-// URLRequestJob Implementation.
+// net::URLRequestJob Implementation.
 void URLRequestAutomationJob::Start() {
   if (!is_pending()) {
     // Start reading asynchronously so that all error reporting and data
@@ -152,7 +153,7 @@ void URLRequestAutomationJob::Kill() {
     }
   }
   DisconnectFromMessageFilter();
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
 }
 
 bool URLRequestAutomationJob::ReadRawData(
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index 9928fd3..0c930ba 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.h
@@ -24,7 +24,7 @@ class Message;
 struct AutomationURLResponse;
 }
 
-// URLRequestJob implementation that loads the resources using
+// net::URLRequestJob implementation that loads the resources using
 // automation.
 class URLRequestAutomationJob : public net::URLRequestJob {
  public:
@@ -37,7 +37,7 @@ class URLRequestAutomationJob : public net::URLRequestJob {
 
   static net::URLRequest::ProtocolFactory Factory;
 
-  // URLRequestJob methods.
+  // net::URLRequestJob methods.
   virtual void Start();
   virtual void Kill();
   virtual bool GetMimeType(std::string* mime_type) const;
@@ -73,7 +73,7 @@ class URLRequestAutomationJob : public net::URLRequestJob {
                        AutomationResourceMessageFilter* new_filter);
 
  protected:
-  // Protected URLRequestJob override.
+  // Protected net::URLRequestJob override.
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read);
 
   void StartAsync();
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index 3dfedc8..9248036 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -56,7 +56,7 @@ using base::TimeDelta;
 class PluginRequestInterceptor
     : public PluginHelper, public net::URLRequest::Interceptor {
  public:
-  static URLRequestJob* UninterceptedProtocolHandler(
+  static net::URLRequestJob* UninterceptedProtocolHandler(
       net::URLRequest* request, const std::string& scheme) {
     // This will get called if a plugin failed to intercept a request for a
     // protocol it has registered.  In that case, we return NULL and the request
@@ -97,7 +97,7 @@ class PluginRequestInterceptor
   }
 
   // net::URLRequest::Interceptor
-  virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) {
     // TODO(darin): This DCHECK fails in the unit tests because our interceptor
     // is being persisted across unit tests.  As a result, each time we get
     // poked on a different thread, but never from more than one thread at a
diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index c2e0e4b..69f97b2a 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -43,14 +43,14 @@ GViewRequestInterceptor::~GViewRequestInterceptor() {
   net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
-URLRequestJob* GViewRequestInterceptor::MaybeIntercept(
+net::URLRequestJob* GViewRequestInterceptor::MaybeIntercept(
     net::URLRequest* request) {
   // Don't attempt to intercept here as we want to wait until the mime
   // type is fully determined.
   return NULL;
 }
 
-URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
+net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
     net::URLRequest* request) {
   // Do not intercept this request if it is a download.
   if (request->load_flags() & net::LOAD_IS_DOWNLOAD) {
diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index cd8dfde..a8b8250 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -27,7 +27,7 @@ class GViewRequestInterceptor : public net::URLRequest::Interceptor {
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
 
   // Determines if the requested document can be viewed by the Google
-  // Document Viewer.  If it can, returns a URLRequestJob that
+  // Document Viewer.  If it can, returns a net::URLRequestJob that
   // redirects the browser to the view URL.
   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
 
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index 1f3b7be..ac72746 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -28,7 +28,7 @@ class GViewURLRequestTestJob : public URLRequestTestJob {
     // created -- the first is for the viewable document URL, and the
     // second is for the rediected URL.  In order to test the
     // interceptor, the mime type of the first request must be one of
-    // the supported viewable mime types.  So when the URLRequestJob
+    // the supported viewable mime types.  So when the net::URLRequestJob
     // is a request for one of the test URLs that point to viewable
     // content, return an appropraite mime type.  Otherwise, return
     // "text/html".
@@ -60,8 +60,8 @@ class GViewRequestInterceptorTest : public testing::Test {
     message_loop_.RunAllPending();
   }
 
-  static URLRequestJob* Factory(net::URLRequest* request,
-                                const std::string& scheme) {
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme) {
     return new GViewURLRequestTestJob(request);
   }
 
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc
index 1e8840d..0e3a2d7 100644
--- a/chrome/browser/chromeos/login/account_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc
@@ -62,8 +62,8 @@ static void QuitUIMessageLoop() {
 static bool inspector_called = false;  // had to use global flag as
                                        // InspectorHook() doesn't have context.
 
-static URLRequestJob* InspectorHook(net::URLRequest* request,
-                                    const std::string& scheme) {
+static net::URLRequestJob* InspectorHook(net::URLRequest* request,
+                                         const std::string& scheme) {
   VLOG(1) << "Intercepted: " << request->url() << ", scheme: " << scheme;
 
   // Expect that the parameters are the same as new_account.html gave us.
diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc
index 9a93706..dbc2e68 100644
--- a/chrome/browser/chromeos/login/registration_screen.cc
+++ b/chrome/browser/chromeos/login/registration_screen.cc
@@ -142,8 +142,8 @@ void RegistrationScreen::CloseScreen(ScreenObserver::ExitCodes code) {
 }
 
 // static
-URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request,
-                                           const std::string& scheme) {
+net::URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request,
+                                                const std::string& scheme) {
   VLOG(1) << "Handling url: " << request->url().spec().c_str();
   return new URLRequestAboutJob(request);
 }
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc
index 6153458..adfb744 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.cc
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc
@@ -34,15 +34,15 @@
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_job.h"
 
-// URLRequestChromeJob is a URLRequestJob that manages running chrome-internal
-// resource requests asynchronously.
+// URLRequestChromeJob is a net::URLRequestJob that manages running
+// chrome-internal resource requests asynchronously.
 // It hands off URL requests to ChromeURLDataManager, which asynchronously
 // calls back once the data is available.
 class URLRequestChromeJob : public net::URLRequestJob {
  public:
   explicit URLRequestChromeJob(net::URLRequest* request);
 
-  // URLRequestJob implementation.
+  // net::URLRequestJob implementation.
   virtual void Start();
   virtual void Kill();
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
@@ -60,7 +60,7 @@ class URLRequestChromeJob : public net::URLRequestJob {
   virtual ~URLRequestChromeJob();
 
   // Helper for Start(), to let us start asynchronously.
-  // (This pattern is shared by most URLRequestJob implementations.)
+  // (This pattern is shared by most net::URLRequestJob implementations.)
   void StartAsync();
 
   // Do the actual copy from data_ (the data we're serving) into |buf|.
@@ -82,7 +82,7 @@ class URLRequestChromeJob : public net::URLRequestJob {
   DISALLOW_COPY_AND_ASSIGN(URLRequestChromeJob);
 };
 
-// URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL
+// URLRequestChromeFileJob is a net::URLRequestJob that acts like a file:// URL
 class URLRequestChromeFileJob : public URLRequestFileJob {
  public:
   URLRequestChromeFileJob(net::URLRequest* request, const FilePath& path);
@@ -322,8 +322,8 @@ void ChromeURLDataManager::DataSource::SetFontAndTextDirection(
       base::i18n::IsRTL() ? "rtl" : "ltr");
 }
 
-URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request,
-                                             const std::string& scheme) {
+net::URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request,
+                                                  const std::string& scheme) {
   // Try first with a file handler
   FilePath path;
   if (ChromeURLDataManager::URLToFilePath(request->url(), &path))
@@ -346,7 +346,7 @@ URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request,
 }
 
 URLRequestChromeJob::URLRequestChromeJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       data_offset_(0),
       pending_buf_size_(0) {
 }
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index 3119e534..f69ebcd 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.cc
@@ -543,7 +543,7 @@ void MediaPlayer::PopupMediaPlayer(Browser* creator) {
   mediaplayer_browser_->window()->Show();
 }
 
-URLRequestJob* MediaPlayer::MaybeIntercept(net::URLRequest* request) {
+net::URLRequestJob* MediaPlayer::MaybeIntercept(net::URLRequest* request) {
   // Don't attempt to intercept here as we want to wait until the mime
   // type is fully determined.
   return NULL;
@@ -557,7 +557,7 @@ static const char* const supported_mime_type_list[] = {
   "audio/mp3"
 };
 
-URLRequestJob* MediaPlayer::MaybeInterceptResponse(
+net::URLRequestJob* MediaPlayer::MaybeInterceptResponse(
     net::URLRequest* request) {
   // Do not intercept this request if it is a download.
   if (request->load_flags() & net::LOAD_IS_DOWNLOAD) {
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h
index ec198b2..c7168ee 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.h
+++ b/chrome/browser/dom_ui/mediaplayer_ui.h
@@ -78,7 +78,7 @@ class MediaPlayer : public NotificationObserver,
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
 
   // Determines if the requested document can be viewed by the
-  // MediaPlayer.  If it can, returns a URLRequestJob that
+  // MediaPlayer.  If it can, returns a net::URLRequestJob that
   // redirects the browser to the view URL.
   // Implementation of net::URLRequest::Interceptor.
   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc
index b50000c..e919189 100644
--- a/chrome/browser/extensions/autoupdate_interceptor.cc
+++ b/chrome/browser/extensions/autoupdate_interceptor.cc
@@ -33,7 +33,8 @@ AutoUpdateInterceptor::~AutoUpdateInterceptor() {
   net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
-URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(net::URLRequest* request) {
+net::URLRequestJob* AutoUpdateInterceptor::MaybeIntercept(
+    net::URLRequest* request) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request->url().scheme() != "http" ||
       request->url().host() != "localhost") {
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index cc20413..47adedd 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -144,8 +144,9 @@ bool AllowExtensionResourceLoad(net::URLRequest* request,
 
 // Factory registered with net::URLRequest to create URLRequestJobs for
 // extension:// URLs.
-static URLRequestJob* CreateExtensionURLRequestJob(net::URLRequest* request,
-                                                   const std::string& scheme) {
+static net::URLRequestJob* CreateExtensionURLRequestJob(
+    net::URLRequest* request,
+    const std::string& scheme) {
   ChromeURLRequestContext* context =
       static_cast<ChromeURLRequestContext*>(request->context());
 
@@ -203,8 +204,9 @@ static URLRequestJob* CreateExtensionURLRequestJob(net::URLRequest* request,
 
 // Factory registered with net::URLRequest to create URLRequestJobs for
 // chrome-user-script:/ URLs.
-static URLRequestJob* CreateUserScriptURLRequestJob(net::URLRequest* request,
-                                                    const std::string& scheme) {
+static net::URLRequestJob* CreateUserScriptURLRequestJob(
+    net::URLRequest* request,
+    const std::string& scheme) {
   ChromeURLRequestContext* context =
       static_cast<ChromeURLRequestContext*>(request->context());
 
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 57153b7..1564fe9 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -93,8 +93,8 @@ ResourceDispatcherHostRequestInfo* CreateRequestInfo(int request_id) {
       0, false, false, false, -1, -1);
 }
 
-// A simple test URLRequestJob. We don't care what it does, only that whether it
-// starts and finishes.
+// A simple test net::URLRequestJob. We don't care what it does, only that
+// whether it starts and finishes.
 class SimpleTestJob : public URLRequestTestJob {
  public:
   explicit SimpleTestJob(net::URLRequest* request)
@@ -136,7 +136,7 @@ class UserScriptListenerTest
   }
 
   // net::URLRequest::Interceptor
-  virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) {
     return new SimpleTestJob(request);
   }
 
diff --git a/chrome/browser/net/blob_url_request_job_factory.cc b/chrome/browser/net/blob_url_request_job_factory.cc
index 798c21b..2aaebc7 100644
--- a/chrome/browser/net/blob_url_request_job_factory.cc
+++ b/chrome/browser/net/blob_url_request_job_factory.cc
@@ -15,8 +15,8 @@
 
 namespace {
 
-URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
-                                        const std::string& scheme) {
+net::URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
+                                             const std::string& scheme) {
   scoped_refptr<webkit_blob::BlobData> data;
   ResourceDispatcherHostRequestInfo* info =
       ResourceDispatcherHost::InfoForRequest(request);
diff --git a/chrome/browser/net/metadata_url_request.cc b/chrome/browser/net/metadata_url_request.cc
index 0f69d6d..375e664 100644
--- a/chrome/browser/net/metadata_url_request.cc
+++ b/chrome/browser/net/metadata_url_request.cc
@@ -21,10 +21,10 @@ class MetadataRequestHandler : public net::URLRequestJob {
  public:
   explicit MetadataRequestHandler(net::URLRequest* request);
 
-  static URLRequestJob* Factory(net::URLRequest* request,
-                                const std::string& scheme);
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme);
 
-  // URLRequestJob implementation.
+  // net::URLRequestJob implementation.
   virtual void Start();
   virtual void Kill();
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
@@ -41,7 +41,7 @@ class MetadataRequestHandler : public net::URLRequestJob {
 };
 
 MetadataRequestHandler::MetadataRequestHandler(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       data_offset_(0) {
   parsed = false;
 }
@@ -49,7 +49,7 @@ MetadataRequestHandler::MetadataRequestHandler(net::URLRequest* request)
 MetadataRequestHandler::~MetadataRequestHandler() {
 }
 
-URLRequestJob* MetadataRequestHandler::Factory(net::URLRequest* request,
+net::URLRequestJob* MetadataRequestHandler::Factory(net::URLRequest* request,
                                                const std::string& scheme) {
   return new MetadataRequestHandler(request);
 }
diff --git a/chrome/browser/net/url_request_failed_dns_job.cc b/chrome/browser/net/url_request_failed_dns_job.cc
index 7b6a16b..7137468 100644
--- a/chrome/browser/net/url_request_failed_dns_job.cc
+++ b/chrome/browser/net/url_request_failed_dns_job.cc
@@ -15,7 +15,7 @@ const char URLRequestFailedDnsJob::kTestUrl[] =
     "http://url.handled.by.fake.dns/";
 
 URLRequestFailedDnsJob::URLRequestFailedDnsJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {}
 
 URLRequestFailedDnsJob::~URLRequestFailedDnsJob() {}
@@ -35,7 +35,7 @@ void URLRequestFailedDnsJob::AddUrlHandler() {
 }
 
 /*static */
-URLRequestJob* URLRequestFailedDnsJob::Factory(net::URLRequest* request,
+net::URLRequestJob* URLRequestFailedDnsJob::Factory(net::URLRequest* request,
     const std::string& scheme) {
   return new URLRequestFailedDnsJob(request);
 }
diff --git a/chrome/browser/net/url_request_mock_http_job.cc b/chrome/browser/net/url_request_mock_http_job.cc
index 22fe5bf..f9feb1a3 100644
--- a/chrome/browser/net/url_request_mock_http_job.cc
+++ b/chrome/browser/net/url_request_mock_http_job.cc
@@ -21,8 +21,8 @@ static const FilePath::CharType kMockHeaderFileSuffix[] =
 FilePath URLRequestMockHTTPJob::base_path_;
 
 /* static */
-URLRequestJob* URLRequestMockHTTPJob::Factory(net::URLRequest* request,
-                                              const std::string& scheme) {
+net::URLRequestJob* URLRequestMockHTTPJob::Factory(net::URLRequest* request,
+                                                   const std::string& scheme) {
   return new URLRequestMockHTTPJob(request,
                                    GetOnDiskPath(base_path_, request, scheme));
 }
@@ -82,7 +82,7 @@ bool URLRequestMockHTTPJob::IsRedirectResponse(GURL* location,
                                                int* http_status_code) {
   // Override the URLRequestFileJob implementation to invoke the default one
   // based on HttpResponseInfo.
-  return URLRequestJob::IsRedirectResponse(location, http_status_code);
+  return net::URLRequestJob::IsRedirectResponse(location, http_status_code);
 }
 
 // Private const version.
diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
index d2c0e0b..eabb0e1 100644
--- a/chrome/browser/net/url_request_mock_http_job.h
+++ b/chrome/browser/net/url_request_mock_http_job.h
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// A URLRequestJob class that pulls the content and http headers from disk.
+// A net::URLRequestJob class that pulls the content and http headers from disk.
 
 #ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
 #define CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.cc b/chrome/browser/net/url_request_mock_link_doctor_job.cc
index 66d7e3f..e11978e 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.cc
@@ -22,8 +22,9 @@ FilePath GetMockFilePath() {
 }  // namespace
 
 /* static */
-URLRequestJob* URLRequestMockLinkDoctorJob::Factory(net::URLRequest* request,
-                                                    const std::string& scheme) {
+net::URLRequestJob* URLRequestMockLinkDoctorJob::Factory(
+    net::URLRequest* request,
+    const std::string& scheme) {
   return new URLRequestMockLinkDoctorJob(request);
 }
 
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index 19a02f4..3c3af31 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// A URLRequestJob class that substitutes LinkDoctor requests.
+// A net::URLRequestJob class that substitutes LinkDoctor requests.
 
 #ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
 #define CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index 51094d6..a06dbd3 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -57,8 +57,9 @@ void URLRequestMockNetErrorJob::RemoveMockedURL(const GURL& url) {
 }
 
 // static
-URLRequestJob* URLRequestMockNetErrorJob::Factory(net::URLRequest* request,
-                                                  const std::string& scheme) {
+net::URLRequestJob* URLRequestMockNetErrorJob::Factory(
+    net::URLRequest* request,
+    const std::string& scheme) {
   GURL url = request->url();
 
   URLMockInfoMap::const_iterator iter = url_mock_info_map_.find(url);
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 3416bd9..33b1fc0 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// A URLRequestJob class that simulates network errors (including https
+// A net::URLRequestJob class that simulates network errors (including https
 // related).
 // It is based on URLRequestMockHttpJob.
 
diff --git a/chrome/browser/net/url_request_slow_download_job.cc b/chrome/browser/net/url_request_slow_download_job.cc
index 7158e7c..b5d7de1 100644
--- a/chrome/browser/net/url_request_slow_download_job.cc
+++ b/chrome/browser/net/url_request_slow_download_job.cc
@@ -45,7 +45,7 @@ void URLRequestSlowDownloadJob::AddUrlHandler() {
 }
 
 /*static */
-URLRequestJob* URLRequestSlowDownloadJob::Factory(
+net::URLRequestJob* URLRequestSlowDownloadJob::Factory(
     net::URLRequest* request,
     const std::string& scheme) {
   URLRequestSlowDownloadJob* job = new URLRequestSlowDownloadJob(request);
@@ -65,7 +65,7 @@ void URLRequestSlowDownloadJob::FinishPendingRequests() {
 }
 
 URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       first_download_size_remaining_(kFirstDownloadSize),
       should_finish_download_(false),
       should_send_second_chunk_(false),
diff --git a/chrome/browser/net/url_request_slow_download_job.h b/chrome/browser/net/url_request_slow_download_job.h
index 2d8502c..ca4a23d 100644
--- a/chrome/browser/net/url_request_slow_download_job.h
+++ b/chrome/browser/net/url_request_slow_download_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // This class simulates a slow download.  This used in a UI test to test the
@@ -15,7 +15,7 @@
 #include "base/task.h"
 #include "net/url_request/url_request_job.h"
 
-class URLRequestSlowDownloadJob : public URLRequestJob {
+class URLRequestSlowDownloadJob : public net::URLRequestJob {
  public:
   explicit URLRequestSlowDownloadJob(net::URLRequest* request);
 
@@ -23,7 +23,7 @@ class URLRequestSlowDownloadJob : public URLRequestJob {
   // send the second chunk.
   void CheckDoneStatus();
 
-  // URLRequestJob methods
+  // net::URLRequestJob methods
   virtual void Start();
   virtual bool GetMimeType(std::string* mime_type) const;
   virtual void GetResponseInfo(net::HttpResponseInfo* info);
diff --git a/chrome/browser/net/url_request_slow_http_job.cc b/chrome/browser/net/url_request_slow_http_job.cc
index 12065ab..967ea1e 100644
--- a/chrome/browser/net/url_request_slow_http_job.cc
+++ b/chrome/browser/net/url_request_slow_http_job.cc
@@ -19,8 +19,8 @@ const int URLRequestSlowHTTPJob::kDelayMs = 1000;
 using base::TimeDelta;
 
 /* static */
-URLRequestJob* URLRequestSlowHTTPJob::Factory(net::URLRequest* request,
-                                              const std::string& scheme) {
+net::URLRequestJob* URLRequestSlowHTTPJob::Factory(net::URLRequest* request,
+                                                   const std::string& scheme) {
   return new URLRequestSlowHTTPJob(request,
                                    GetOnDiskPath(base_path_, request, scheme));
 }
diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc
index 4fdbefc..ad2349f 100644
--- a/chrome/browser/net/view_blob_internals_job_factory.cc
+++ b/chrome/browser/net/view_blob_internals_job_factory.cc
@@ -18,7 +18,7 @@ bool ViewBlobInternalsJobFactory::IsSupportedURL(const GURL& url) {
 }
 
 // static.
-URLRequestJob* ViewBlobInternalsJobFactory::CreateJobForRequest(
+net::URLRequestJob* ViewBlobInternalsJobFactory::CreateJobForRequest(
     net::URLRequest* request) {
   webkit_blob::BlobStorageController* blob_storage_controller =
       static_cast<ChromeURLRequestContext*>(request->context())->
diff --git a/chrome/browser/net/view_http_cache_job_factory.cc b/chrome/browser/net/view_http_cache_job_factory.cc
index 8703877..839130d 100644
--- a/chrome/browser/net/view_http_cache_job_factory.cc
+++ b/chrome/browser/net/view_http_cache_job_factory.cc
@@ -19,7 +19,10 @@ namespace {
 class ViewHttpCacheJob : public net::URLRequestJob {
  public:
   explicit ViewHttpCacheJob(net::URLRequest* request)
-      : URLRequestJob(request), data_offset_(0), cancel_(false), busy_(false),
+      : net::URLRequestJob(request),
+        data_offset_(0),
+        cancel_(false),
+        busy_(false),
         ALLOW_THIS_IN_INITIALIZER_LIST(
             callback_(this, &ViewHttpCacheJob::OnIOComplete)) {}
 
@@ -75,7 +78,7 @@ void ViewHttpCacheJob::Kill() {
   // is safe.
   cancel_ = true;
   if (!busy_)
-    URLRequestJob::Kill();
+    net::URLRequestJob::Kill();
 }
 
 bool ViewHttpCacheJob::GetMimeType(std::string* mime_type) const {
@@ -108,7 +111,7 @@ void ViewHttpCacheJob::OnIOComplete(int result) {
   Release();  // Acquired on Start().
 
   if (cancel_)
-    return URLRequestJob::Kill();
+    return net::URLRequestJob::Kill();
 
   // Notify that the headers are complete.
   NotifyHeadersComplete();
@@ -123,7 +126,7 @@ bool ViewHttpCacheJobFactory::IsSupportedURL(const GURL& url) {
 }
 
 // Static.
-URLRequestJob* ViewHttpCacheJobFactory::CreateJobForRequest(
+net::URLRequestJob* ViewHttpCacheJobFactory::CreateJobForRequest(
     net::URLRequest* request) {
   return new ViewHttpCacheJob(request);
 }
diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
index f4c3f7b..1b5496c 100644
--- a/chrome/browser/policy/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/device_management_service_browsertest.cc
@@ -58,7 +58,7 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
 
  private:
   // net::URLRequest::Interceptor overrides.
-  virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) {
     if (request->url().GetOrigin() == service_url_.GetOrigin() &&
         request->url().path() == service_url_.path()) {
       return new URLRequestTestJob(request,
diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc
index e4c8804..40824de 100644
--- a/chrome/browser/printing/print_dialog_cloud_uitest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc
@@ -57,7 +57,7 @@ class TestData {
   friend struct DefaultSingletonTraits<TestData>;
 };
 
-// A simple test URLRequestJob. We don't care what it does, only that
+// A simple test net::URLRequestJob. We don't care what it does, only that
 // whether it starts and finishes.
 class SimpleTestJob : public URLRequestTestJob {
  public:
@@ -208,8 +208,8 @@ class PrintDialogCloudTest : public InProcessBrowserTest {
   AutoQuitDelegate delegate_;
 };
 
-URLRequestJob* PrintDialogCloudTest::Factory(net::URLRequest* request,
-                                             const std::string& scheme) {
+net::URLRequestJob* PrintDialogCloudTest::Factory(net::URLRequest* request,
+                                                  const std::string& scheme) {
   if (TestController::GetInstance()->use_delegate())
     request->set_delegate(TestController::GetInstance()->delegate());
   if (request &&
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
index ead2239..5c92a45 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_request_info.h
@@ -168,7 +168,7 @@ class ResourceDispatcherHostRequestInfo : public net::URLRequest::UserData {
   int host_render_view_id() const { return host_render_view_id_; }
 
   // We hold a reference to the requested blob data to ensure it doesn't
-  // get finally released prior to the URLRequestJob being started.
+  // get finally released prior to the net::URLRequestJob being started.
   webkit_blob::BlobData* requested_blob_data() const {
     return requested_blob_data_.get();
   }
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
index 228c83e..7240608 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host_unittest.cc
@@ -255,9 +255,9 @@ class ResourceDispatcherHostTest : public testing::Test,
         scheme_, &ResourceDispatcherHostTest::Factory);
   }
 
-  // Our own URLRequestJob factory.
-  static URLRequestJob* Factory(net::URLRequest* request,
-                                const std::string& scheme) {
+  // Our own net::URLRequestJob factory.
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme) {
     if (test_fixture_->response_headers_.empty()) {
       return new URLRequestTestJob(request);
     } else {
diff --git a/chrome/browser/renderer_host/resource_queue_unittest.cc b/chrome/browser/renderer_host/resource_queue_unittest.cc
index fa466f1..3339701 100644
--- a/chrome/browser/renderer_host/resource_queue_unittest.cc
+++ b/chrome/browser/renderer_host/resource_queue_unittest.cc
@@ -164,7 +164,7 @@ class ResourceQueueTest : public testing::Test,
   virtual void OnResponseStarted(net::URLRequest* request) {
     response_started_count_++;
     // We're not going to do anything more with the request. Cancel it now
-    // to avoid leaking URLRequestJob.
+    // to avoid leaking net::URLRequestJob.
     request->Cancel();
   }
 
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 1cb3c59..38531d8 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -865,26 +865,26 @@ void TaskManagerModel::BytesRead(BytesReadParam param) {
 }
 
 
-// In order to retrieve the network usage, we register for URLRequestJob
+// In order to retrieve the network usage, we register for net::URLRequestJob
 // notifications. Every time we get notified some bytes were read we bump a
 // counter of read bytes for the associated resource. When the timer ticks,
 // we'll compute the actual network usage (see the Refresh method).
-void TaskManagerModel::OnJobAdded(URLRequestJob* job) {
+void TaskManagerModel::OnJobAdded(net::URLRequestJob* job) {
 }
 
-void TaskManagerModel::OnJobRemoved(URLRequestJob* job) {
+void TaskManagerModel::OnJobRemoved(net::URLRequestJob* job) {
 }
 
-void TaskManagerModel::OnJobDone(URLRequestJob* job,
+void TaskManagerModel::OnJobDone(net::URLRequestJob* job,
                                  const URLRequestStatus& status) {
 }
 
-void TaskManagerModel::OnJobRedirect(URLRequestJob* job,
+void TaskManagerModel::OnJobRedirect(net::URLRequestJob* job,
                                      const GURL& location,
                                      int status_code) {
 }
 
-void TaskManagerModel::OnBytesRead(URLRequestJob* job, const char* buf,
+void TaskManagerModel::OnBytesRead(net::URLRequestJob* job, const char* buf,
                                    int byte_count) {
   int render_process_host_child_id = -1, routing_id = -1;
   ResourceDispatcherHost::RenderViewForRequest(job->request(),
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index eb3b74f..04e9dd3 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.cc
@@ -29,7 +29,7 @@ using base::TimeDelta;
 URLRequestInterceptJob::URLRequestInterceptJob(net::URLRequest* request,
                                                ChromePluginLib* plugin,
                                                ScopableCPRequest* cprequest)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       cprequest_(cprequest),
       plugin_(plugin),
       read_buffer_(NULL),
@@ -67,7 +67,7 @@ void URLRequestInterceptJob::Kill() {
                                                     CPERR_CANCELLED);
     DetachPlugin();
   }
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
   method_factory_.RevokeAll();
 }
 
diff --git a/chrome/common/net/url_request_intercept_job.h b/chrome/common/net/url_request_intercept_job.h
index 1d84e42..581b30a 100644
--- a/chrome/common/net/url_request_intercept_job.h
+++ b/chrome/common/net/url_request_intercept_job.h
@@ -37,7 +37,7 @@ class URLRequestInterceptJob : public net::URLRequestJob,
   void OnStartCompleted(int result);
   void OnReadCompleted(int bytes_read);
 
-  // URLRequestJob
+  // net::URLRequestJob
   virtual void Start();
   virtual void Kill();
   virtual bool GetMimeType(std::string* mime_type) const;
diff --git a/chrome_frame/test/net/test_automation_provider.cc b/chrome_frame/test/net/test_automation_provider.cc
index 85246cc..4b4d2a1 100644
--- a/chrome_frame/test/net/test_automation_provider.cc
+++ b/chrome_frame/test/net/test_automation_provider.cc
@@ -69,8 +69,8 @@ bool TestAutomationProvider::Send(IPC::Message* msg) {
   return AutomationProvider::Send(msg);
 }
 
-URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
-                                               const std::string& scheme) {
+net::URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
+                                                    const std::string& scheme) {
   if (CFTestsDisabled())
     return NULL;
 
diff --git a/net/base/net_log_event_type_list.h b/net/base/net_log_event_type_list.h
index 92c65d1..e571685 100644
--- a/net/base/net_log_event_type_list.h
+++ b/net/base/net_log_event_type_list.h
@@ -468,8 +468,8 @@ EVENT_TYPE(SOCKET_POOL_CONNECTING_N_SOCKETS)
 // net::URLRequest
 // ------------------------------------------------------------------------
 
-// Measures the time it took a URLRequestJob to start. For the most part this
-// corresponds with the time between net::URLRequest::Start() and
+// Measures the time it took a net::URLRequestJob to start. For the most part
+// this corresponds with the time between net::URLRequest::Start() and
 // net::URLRequest::ResponseStarted(), however it is also repeated for every
 // redirect, and every intercepted job that handles the request.
 //
diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc
index 145093e..51cd9bf 100644
--- a/net/url_request/url_request_about_job.cc
+++ b/net/url_request/url_request_about_job.cc
@@ -11,13 +11,13 @@
 #include "base/message_loop.h"
 
 // static
-URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request,
-                                           const std::string& scheme) {
+net::URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request,
+                                                const std::string& scheme) {
   return new URLRequestAboutJob(request);
 }
 
 URLRequestAboutJob::URLRequestAboutJob(net::URLRequest* request)
-    : URLRequestJob(request) {
+    : net::URLRequestJob(request) {
 }
 
 void URLRequestAboutJob::Start() {
diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h
index 65f1f61..cd1d372 100644
--- a/net/url_request/url_request_about_job.h
+++ b/net/url_request/url_request_about_job.h
@@ -11,7 +11,7 @@
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
-class URLRequestAboutJob : public URLRequestJob {
+class URLRequestAboutJob : public net::URLRequestJob {
  public:
   explicit URLRequestAboutJob(net::URLRequest* request);
 
diff --git a/net/url_request/url_request_data_job.cc b/net/url_request/url_request_data_job.cc
index 3d9dace..c0a6e70 100644
--- a/net/url_request/url_request_data_job.cc
+++ b/net/url_request/url_request_data_job.cc
@@ -10,8 +10,8 @@
 #include "net/url_request/url_request.h"
 
 // static
-URLRequestJob* URLRequestDataJob::Factory(net::URLRequest* request,
-                                          const std::string& scheme) {
+net::URLRequestJob* URLRequestDataJob::Factory(net::URLRequest* request,
+                                               const std::string& scheme) {
   return new URLRequestDataJob(request);
 }
 
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index 1aeffac..c8f350b 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -9,7 +9,7 @@
 #include "net/url_request/url_request_status.h"
 
 URLRequestErrorJob::URLRequestErrorJob(net::URLRequest* request, int error)
-    : URLRequestJob(request), error_(error) {
+    : net::URLRequestJob(request), error_(error) {
 }
 
 void URLRequestErrorJob::Start() {
diff --git a/net/url_request/url_request_error_job.h b/net/url_request/url_request_error_job.h
index 6e7c879..58729c8 100644
--- a/net/url_request/url_request_error_job.h
+++ b/net/url_request/url_request_error_job.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// Invalid URLs go through this URLRequestJob class rather than being passed
-// to the default job handler.
+// Invalid URLs go through this net::URLRequestJob class rather than being
+// passed to the default job handler.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_ERROR_JOB_H_
@@ -11,7 +11,7 @@
 
 #include "net/url_request/url_request_job.h"
 
-class URLRequestErrorJob : public URLRequestJob {
+class URLRequestErrorJob : public net::URLRequestJob {
  public:
   URLRequestErrorJob(net::URLRequest* request, int error);
 
diff --git a/net/url_request/url_request_file_dir_job.cc b/net/url_request/url_request_file_dir_job.cc
index f58df6f..553add8 100644
--- a/net/url_request/url_request_file_dir_job.cc
+++ b/net/url_request/url_request_file_dir_job.cc
@@ -23,7 +23,7 @@ using std::string;
 
 URLRequestFileDirJob::URLRequestFileDirJob(net::URLRequest* request,
                                            const FilePath& dir_path)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       dir_path_(dir_path),
       canceled_(false),
       list_complete_(false),
@@ -75,7 +75,7 @@ void URLRequestFileDirJob::Kill() {
   if (lister_)
     lister_->Cancel();
 
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
 
   method_factory_.RevokeAll();
 }
diff --git a/net/url_request/url_request_file_dir_job.h b/net/url_request/url_request_file_dir_job.h
index 41fd9c1..bdb9b37 100644
--- a/net/url_request/url_request_file_dir_job.h
+++ b/net/url_request/url_request_file_dir_job.h
@@ -15,12 +15,12 @@
 #include "net/url_request/url_request_job.h"
 
 class URLRequestFileDirJob
-  : public URLRequestJob,
+  : public net::URLRequestJob,
     public net::DirectoryLister::DirectoryListerDelegate {
  public:
   URLRequestFileDirJob(net::URLRequest* request, const FilePath& dir_path);
 
-  // URLRequestJob methods:
+  // net::URLRequestJob methods:
   virtual void Start();
   virtual void StartAsync();
   virtual void Kill();
diff --git a/net/url_request/url_request_file_job.cc b/net/url_request/url_request_file_job.cc
index 01462c4..2061849 100644
--- a/net/url_request/url_request_file_job.cc
+++ b/net/url_request/url_request_file_job.cc
@@ -83,8 +83,8 @@ class URLRequestFileJob::AsyncResolver
 #endif
 
 // static
-URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request,
-                                          const std::string& scheme) {
+net::URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request,
+                                               const std::string& scheme) {
 
   FilePath file_path;
   const bool is_file = net::FileURLToFilePath(request->url(), &file_path);
@@ -113,7 +113,7 @@ URLRequestJob* URLRequestFileJob::Factory(net::URLRequest* request,
 
 URLRequestFileJob::URLRequestFileJob(net::URLRequest* request,
                                      const FilePath& file_path)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       file_path_(file_path),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           io_callback_(this, &URLRequestFileJob::DidRead)),
@@ -166,7 +166,7 @@ void URLRequestFileJob::Kill() {
   }
 #endif
 
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
   method_factory_.RevokeAll();
 }
 
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index 342deeb..7fb6652 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -22,7 +22,7 @@ struct FileInfo;
 }
 
 // A request job that handles reading file URLs
-class URLRequestFileJob : public URLRequestJob {
+class URLRequestFileJob : public net::URLRequestJob {
  public:
   URLRequestFileJob(net::URLRequest* request, const FilePath& file_path);
 
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index c6d8ff1..0463278 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -17,7 +17,7 @@
 #include "net/url_request/url_request_error_job.h"
 
 URLRequestFtpJob::URLRequestFtpJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           start_callback_(this, &URLRequestFtpJob::OnStartCompleted)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
@@ -31,8 +31,8 @@ URLRequestFtpJob::~URLRequestFtpJob() {
 }
 
 // static
-URLRequestJob* URLRequestFtpJob::Factory(net::URLRequest* request,
-                                         const std::string& scheme) {
+net::URLRequestJob* URLRequestFtpJob::Factory(net::URLRequest* request,
+                                              const std::string& scheme) {
   DCHECK_EQ(scheme, "ftp");
 
   int port = request->url().IntPort();
@@ -63,7 +63,7 @@ void URLRequestFtpJob::Kill() {
   if (!transaction_.get())
     return;
   transaction_.reset();
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
   method_factory_.RevokeAll();
 }
 
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 708dc6d..c4b6fbd 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -18,23 +18,23 @@
 
 class URLRequestContext;
 
-// A URLRequestJob subclass that is built on top of FtpTransaction. It
+// A net::URLRequestJob subclass that is built on top of FtpTransaction. It
 // provides an implementation for FTP.
-class URLRequestFtpJob : public URLRequestJob {
+class URLRequestFtpJob : public net::URLRequestJob {
  public:
 
   explicit URLRequestFtpJob(net::URLRequest* request);
 
-  static URLRequestJob* Factory(net::URLRequest* request,
-                                const std::string& scheme);
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme);
 
-  // URLRequestJob methods:
+  // net::URLRequestJob methods:
   virtual bool GetMimeType(std::string* mime_type) const;
 
  private:
   virtual ~URLRequestFtpJob();
 
-  // URLRequestJob methods:
+  // net::URLRequestJob methods:
   virtual void Start();
   virtual void Kill();
   virtual net::LoadState GetLoadState() const;
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index f2b1b4f..3a4bcd7 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -40,8 +40,8 @@ static const char kAvailDictionaryHeader[] = "Avail-Dictionary";
 
 // TODO(darin): make sure the port blocking code is not lost
 // static
-URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request,
-                                          const std::string& scheme) {
+net::URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request,
+                                               const std::string& scheme) {
   DCHECK(scheme == "http" || scheme == "https");
 
   int port = request->url().IntPort();
@@ -78,7 +78,7 @@ URLRequestJob* URLRequestHttpJob::Factory(net::URLRequest* request,
 }
 
 URLRequestHttpJob::URLRequestHttpJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       response_info_(NULL),
       response_cookies_save_index_(0),
       proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
@@ -168,7 +168,7 @@ void URLRequestHttpJob::Kill() {
     return;
 
   DestroyTransaction();
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
 }
 
 net::LoadState URLRequestHttpJob::GetLoadState() const {
@@ -622,7 +622,7 @@ void URLRequestHttpJob::NotifyHeadersComplete() {
     return;
   }
 
-  URLRequestJob::NotifyHeadersComplete();
+  net::URLRequestJob::NotifyHeadersComplete();
 }
 
 void URLRequestHttpJob::DestroyTransaction() {
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index 471b406..6f2beaf 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -24,17 +24,17 @@ class HttpTransaction;
 }
 class URLRequestContext;
 
-// A URLRequestJob subclass that is built on top of HttpTransaction.  It
+// A net::URLRequestJob subclass that is built on top of HttpTransaction.  It
 // provides an implementation for both HTTP and HTTPS.
-class URLRequestHttpJob : public URLRequestJob {
+class URLRequestHttpJob : public net::URLRequestJob {
  public:
-  static URLRequestJob* Factory(net::URLRequest* request,
-                                const std::string& scheme);
+  static net::URLRequestJob* Factory(net::URLRequest* request,
+                                     const std::string& scheme);
 
  protected:
   explicit URLRequestHttpJob(net::URLRequest* request);
 
-  // URLRequestJob methods:
+  // net::URLRequestJob methods:
   virtual void SetUpload(net::UploadData* upload);
   virtual void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers);
   virtual void Start();
@@ -61,7 +61,7 @@ class URLRequestHttpJob : public URLRequestJob {
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
   virtual void StopCaching();
 
-  // Shadows URLRequestJob's version of this method so we can grab cookies.
+  // Shadows net::URLRequestJob's version of this method so we can grab cookies.
   void NotifyHeadersComplete();
 
   void DestroyTransaction();
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc
index 1b56b50..0c54c10 100644
--- a/net/url_request/url_request_job.cc
+++ b/net/url_request/url_request_job.cc
@@ -21,12 +21,12 @@
 using base::Time;
 using base::TimeTicks;
 
+namespace net {
+
 // Buffer size allocated when de-compressing data.
 // static
 const int URLRequestJob::kFilterBufSize = 32 * 1024;
 
-namespace net {
-
 URLRequestJob::URLRequestJob(URLRequest* request)
     : request_(request),
       prefilter_bytes_read_(0),
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index ab54354..0d0f356 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -426,6 +426,4 @@ class URLRequestJob : public base::RefCounted<URLRequestJob>,
 
 }  // namespace net
 
-typedef net::URLRequestJob URLRequestJob;
-
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index 117c15a..914be05 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -51,7 +51,8 @@ URLRequestJobManager* URLRequestJobManager::GetInstance() {
   return Singleton<URLRequestJobManager>::get();
 }
 
-URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
+net::URLRequestJob* URLRequestJobManager::CreateJob(
+    net::URLRequest* request) const {
 #ifndef NDEBUG
   DCHECK(IsAllowedThread());
 #endif
@@ -73,7 +74,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
   if (!(request->load_flags() & net::LOAD_DISABLE_INTERCEPT)) {
     InterceptorList::const_iterator i;
     for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-      URLRequestJob* job = (*i)->MaybeIntercept(request);
+      net::URLRequestJob* job = (*i)->MaybeIntercept(request);
       if (job)
         return job;
     }
@@ -84,7 +85,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
   // built-in protocol factory.
   FactoryMap::const_iterator i = factories_.find(scheme);
   if (i != factories_.end()) {
-    URLRequestJob* job = i->second(request, scheme);
+    net::URLRequestJob* job = i->second(request, scheme);
     if (job)
       return job;
   }
@@ -92,7 +93,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
   // See if the request should be handled by a built-in protocol factory.
   for (size_t i = 0; i < arraysize(kBuiltinFactories); ++i) {
     if (scheme == kBuiltinFactories[i].scheme) {
-      URLRequestJob* job = (kBuiltinFactories[i].factory)(request, scheme);
+      net::URLRequestJob* job = (kBuiltinFactories[i].factory)(request, scheme);
       DCHECK(job);  // The built-in factories are not expected to fail!
       return job;
     }
@@ -105,7 +106,7 @@ URLRequestJob* URLRequestJobManager::CreateJob(net::URLRequest* request) const {
   return new URLRequestErrorJob(request, net::ERR_FAILED);
 }
 
-URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
+net::URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
     net::URLRequest* request,
     const GURL& location) const {
 #ifndef NDEBUG
@@ -119,14 +120,14 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptRedirect(
 
   InterceptorList::const_iterator i;
   for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptRedirect(request, location);
+    net::URLRequestJob* job = (*i)->MaybeInterceptRedirect(request, location);
     if (job)
       return job;
   }
   return NULL;
 }
 
-URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
+net::URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
     net::URLRequest* request) const {
 #ifndef NDEBUG
   DCHECK(IsAllowedThread());
@@ -139,7 +140,7 @@ URLRequestJob* URLRequestJobManager::MaybeInterceptResponse(
 
   InterceptorList::const_iterator i;
   for (i = interceptors_.begin(); i != interceptors_.end(); ++i) {
-    URLRequestJob* job = (*i)->MaybeInterceptResponse(request);
+    net::URLRequestJob* job = (*i)->MaybeInterceptResponse(request);
     if (job)
       return job;
   }
diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h
index 1e56b12..0fb18ba 100644
--- a/net/url_request/url_request_job_manager.h
+++ b/net/url_request/url_request_job_manager.h
@@ -17,7 +17,7 @@
 template <typename T> struct DefaultSingletonTraits;
 
 // This class is responsible for managing the set of protocol factories and
-// request interceptors that determine how an URLRequestJob gets created to
+// request interceptors that determine how an net::URLRequestJob gets created to
 // handle an net::URLRequest.
 //
 // MULTI-THREADING NOTICE:
@@ -32,7 +32,7 @@ class URLRequestJobManager {
   // Returns the singleton instance.
   static URLRequestJobManager* GetInstance();
 
-  // Instantiate an URLRequestJob implementation based on the registered
+  // Instantiate an net::URLRequestJob implementation based on the registered
   // interceptors and protocol factories.  This will always succeed in
   // returning a job unless we are--in the extreme case--out of memory.
   net::URLRequestJob* CreateJob(net::URLRequest* request) const;
diff --git a/net/url_request/url_request_job_metrics.h b/net/url_request/url_request_job_metrics.h
index ce0e4bf..7736859 100644
--- a/net/url_request/url_request_job_metrics.h
+++ b/net/url_request/url_request_job_metrics.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Records IO statistics associated with a URLRequestJob.
+// Records IO statistics associated with a net::URLRequestJob.
 // See description in navigation_profiler.h for an overview of perf profiling.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_METRICS_H_
diff --git a/net/url_request/url_request_job_tracker.cc b/net/url_request/url_request_job_tracker.cc
index f7ef904..3a8b6a1 100644
--- a/net/url_request/url_request_job_tracker.cc
+++ b/net/url_request/url_request_job_tracker.cc
@@ -16,17 +16,17 @@ URLRequestJobTracker::URLRequestJobTracker() {
 
 URLRequestJobTracker::~URLRequestJobTracker() {
   DLOG_IF(WARNING, active_jobs_.size() != 0) <<
-    "Leaking " << active_jobs_.size() << " URLRequestJob object(s), this could "
-    "be because the net::URLRequest forgot to free it (bad), or if the program "
-    "was terminated while a request was active (normal).";
+    "Leaking " << active_jobs_.size() << " net::URLRequestJob object(s), this "
+    "could be because the net::URLRequest forgot to free it (bad), or if the "
+    "program was terminated while a request was active (normal).";
 }
 
-void URLRequestJobTracker::AddNewJob(URLRequestJob* job) {
+void URLRequestJobTracker::AddNewJob(net::URLRequestJob* job) {
   active_jobs_.push_back(job);
   FOR_EACH_OBSERVER(JobObserver, observers_, OnJobAdded(job));
 }
 
-void URLRequestJobTracker::RemoveJob(URLRequestJob* job) {
+void URLRequestJobTracker::RemoveJob(net::URLRequestJob* job) {
   JobList::iterator iter = std::find(active_jobs_.begin(), active_jobs_.end(),
                                      job);
   if (iter == active_jobs_.end()) {
@@ -38,19 +38,19 @@ void URLRequestJobTracker::RemoveJob(URLRequestJob* job) {
   FOR_EACH_OBSERVER(JobObserver, observers_, OnJobRemoved(job));
 }
 
-void URLRequestJobTracker::OnJobDone(URLRequestJob* job,
+void URLRequestJobTracker::OnJobDone(net::URLRequestJob* job,
                                      const URLRequestStatus& status) {
   FOR_EACH_OBSERVER(JobObserver, observers_, OnJobDone(job, status));
 }
 
-void URLRequestJobTracker::OnJobRedirect(URLRequestJob* job,
+void URLRequestJobTracker::OnJobRedirect(net::URLRequestJob* job,
                                          const GURL& location,
                                          int status_code) {
   FOR_EACH_OBSERVER(JobObserver, observers_,
                     OnJobRedirect(job, location, status_code));
 }
 
-void URLRequestJobTracker::OnBytesRead(URLRequestJob* job,
+void URLRequestJobTracker::OnBytesRead(net::URLRequestJob* job,
                                        const char* buf,
                                        int byte_count) {
   FOR_EACH_OBSERVER(JobObserver, observers_,
diff --git a/net/url_request/url_request_job_tracker_unittest.cc b/net/url_request/url_request_job_tracker_unittest.cc
index 21b72c6..fb257e7 100644
--- a/net/url_request/url_request_job_tracker_unittest.cc
+++ b/net/url_request/url_request_job_tracker_unittest.cc
@@ -51,27 +51,27 @@ bool GetResponseBody(const GURL& url, std::string* out_body) {
 
 class MockJobObserver : public URLRequestJobTracker::JobObserver {
  public:
-  MOCK_METHOD1(OnJobAdded, void(URLRequestJob* job));
-  MOCK_METHOD1(OnJobRemoved, void(URLRequestJob* job));
-  MOCK_METHOD2(OnJobDone, void(URLRequestJob* job,
+  MOCK_METHOD1(OnJobAdded, void(net::URLRequestJob* job));
+  MOCK_METHOD1(OnJobRemoved, void(net::URLRequestJob* job));
+  MOCK_METHOD2(OnJobDone, void(net::URLRequestJob* job,
                                const URLRequestStatus& status));
-  MOCK_METHOD3(OnJobRedirect, void(URLRequestJob* job,
+  MOCK_METHOD3(OnJobRedirect, void(net::URLRequestJob* job,
                                    const GURL& location,
                                    int status_code));
-  MOCK_METHOD3(OnBytesRead, void(URLRequestJob* job,
+  MOCK_METHOD3(OnBytesRead, void(net::URLRequestJob* job,
                                  const char* buf,
                                  int byte_count));
 };
 
-// A URLRequestJob that returns static content for given URLs. We do
+// A net::URLRequestJob that returns static content for given URLs. We do
 // not use URLRequestTestJob here because URLRequestTestJob fakes
 // async operations by calling ReadRawData synchronously in an async
-// callback. This test requires a URLRequestJob that returns false for
+// callback. This test requires a net::URLRequestJob that returns false for
 // async reads, in order to exercise the real async read codepath.
-class URLRequestJobTrackerTestJob : public URLRequestJob {
+class URLRequestJobTrackerTestJob : public net::URLRequestJob {
  public:
   URLRequestJobTrackerTestJob(net::URLRequest* request, bool async_reads)
-      : URLRequestJob(request), async_reads_(async_reads) {}
+      : net::URLRequestJob(request), async_reads_(async_reads) {}
 
   void Start() {
     ASSERT_TRUE(GetResponseBody(request_->url(), &response_data_));
@@ -125,7 +125,7 @@ class URLRequestJobTrackerTestJob : public URLRequestJob {
       encoding_types->push_back(Filter::FILTER_TYPE_GZIP);
       return true;
     } else {
-      return URLRequestJob::GetContentEncodings(encoding_types);
+      return net::URLRequestJob::GetContentEncodings(encoding_types);
     }
   }
 
@@ -201,8 +201,9 @@ class URLRequestJobTrackerTest : public PlatformTest {
 };
 
 // static
-URLRequestJob* URLRequestJobTrackerTest::Factory(net::URLRequest* request,
-                                                 const std::string& scheme) {
+net::URLRequestJob* URLRequestJobTrackerTest::Factory(
+    net::URLRequest* request,
+    const std::string& scheme) {
   return new URLRequestJobTrackerTestJob(request, g_async_reads);
 }
 
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc
index 05d18a6..a6cd025 100644
--- a/net/url_request/url_request_redirect_job.cc
+++ b/net/url_request/url_request_redirect_job.cc
@@ -8,7 +8,7 @@
 
 URLRequestRedirectJob::URLRequestRedirectJob(net::URLRequest* request,
                                              GURL redirect_destination)
-    : URLRequestJob(request), redirect_destination_(redirect_destination) {
+    : net::URLRequestJob(request), redirect_destination_(redirect_destination) {
 }
 
 void URLRequestRedirectJob::Start() {
diff --git a/net/url_request/url_request_redirect_job.h b/net/url_request/url_request_redirect_job.h
index bc10eee..4a7f9a7 100644
--- a/net/url_request/url_request_redirect_job.h
+++ b/net/url_request/url_request_redirect_job.h
@@ -10,10 +10,10 @@
 
 class GURL;
 
-// A URLRequestJob that will redirect the request to the specified
+// A net::URLRequestJob that will redirect the request to the specified
 // URL.  This is useful to restart a request at a different URL based
 // on the result of another job.
-class URLRequestRedirectJob : public URLRequestJob {
+class URLRequestRedirectJob : public net::URLRequestJob {
  public:
   // Constructs a job that redirects to the specified URL.
   URLRequestRedirectJob(net::URLRequest* request, GURL redirect_destination);
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index 38e0c4d..a6b0f5d 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -10,7 +10,7 @@
 #include "net/url_request/url_request_status.h"
 
 URLRequestSimpleJob::URLRequestSimpleJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       data_offset_(0) {
 }
 
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index c1081ff..7fd019c 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -70,13 +70,13 @@ std::string URLRequestTestJob::test_error_headers() {
 }
 
 // static
-URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request,
-                                          const std::string& scheme) {
+net::URLRequestJob* URLRequestTestJob::Factory(net::URLRequest* request,
+                                               const std::string& scheme) {
   return new URLRequestTestJob(request);
 }
 
 URLRequestTestJob::URLRequestTestJob(net::URLRequest* request)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       auto_advance_(false),
       stage_(WAITING),
       offset_(0),
@@ -86,7 +86,7 @@ URLRequestTestJob::URLRequestTestJob(net::URLRequest* request)
 
 URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
                                      bool auto_advance)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       auto_advance_(auto_advance),
       stage_(WAITING),
       offset_(0),
@@ -98,7 +98,7 @@ URLRequestTestJob::URLRequestTestJob(net::URLRequest* request,
                                      const std::string& response_headers,
                                      const std::string& response_data,
                                      bool auto_advance)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       auto_advance_(auto_advance),
       stage_(WAITING),
       response_headers_(new net::HttpResponseHeaders(response_headers)),
@@ -207,7 +207,7 @@ bool URLRequestTestJob::IsRedirectResponse(GURL* location,
 
 void URLRequestTestJob::Kill() {
   stage_ = DONE;
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
 }
 
 void URLRequestTestJob::ProcessNextOperation() {
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index eaee403..4be2ec5 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1879,7 +1879,7 @@ class TestInterceptor : net::URLRequest::Interceptor {
     net::URLRequest::UnregisterRequestInterceptor(this);
   }
 
-  virtual URLRequestJob* MaybeIntercept(net::URLRequest* request) {
+  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) {
     if (restart_main_request_) {
       restart_main_request_ = false;
       did_restart_main_ = true;
@@ -1911,8 +1911,8 @@ class TestInterceptor : net::URLRequest::Interceptor {
                                  true);
   }
 
-  virtual URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
-                                                const GURL& location) {
+  virtual net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
+                                                     const GURL& location) {
     if (cancel_redirect_request_) {
       cancel_redirect_request_ = false;
       did_cancel_redirect_ = true;
@@ -1928,7 +1928,7 @@ class TestInterceptor : net::URLRequest::Interceptor {
                                  true);
   }
 
-  virtual URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) {
+  virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) {
     if (cancel_final_request_) {
       cancel_final_request_ = false;
       did_cancel_final_ = true;
diff --git a/webkit/appcache/appcache_interceptor.cc b/webkit/appcache/appcache_interceptor.cc
index 3f61e71..969b513 100644
--- a/webkit/appcache/appcache_interceptor.cc
+++ b/webkit/appcache/appcache_interceptor.cc
@@ -65,14 +65,15 @@ AppCacheInterceptor::~AppCacheInterceptor() {
   net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeIntercept(net::URLRequest* request) {
+net::URLRequestJob* AppCacheInterceptor::MaybeIntercept(
+    net::URLRequest* request) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
   return handler->MaybeLoadResource(request);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
+net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
     net::URLRequest* request,
     const GURL& location) {
   AppCacheRequestHandler* handler = GetHandler(request);
@@ -81,7 +82,7 @@ URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
   return handler->MaybeLoadFallbackForRedirect(request, location);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
+net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index 3556d51..6f69ae9 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -71,10 +71,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
   // Subclasses to simulate particular response codes so test cases can
   // exercise fallback code paths.
 
-  class MockURLRequestJob : public URLRequestJob {
+  class MockURLRequestJob : public net::URLRequestJob {
    public:
     MockURLRequestJob(net::URLRequest* request, int response_code)
-        : URLRequestJob(request), response_code_(response_code) {}
+        : net::URLRequestJob(request), response_code_(response_code) {}
     virtual void Start() {}
     virtual int GetResponseCode() const { return response_code_; }
     int response_code_;
@@ -94,10 +94,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
     }
   };
 
-  static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
-                                           const std::string& scheme) {
+  static net::URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
+                                                const std::string& scheme) {
     if (mock_factory_job_) {
-      URLRequestJob* temp = mock_factory_job_;
+      net::URLRequestJob* temp = mock_factory_job_;
       mock_factory_job_ = NULL;
       return temp;
     } else {
@@ -668,12 +668,12 @@ class AppCacheRequestHandlerTest : public testing::Test {
   net::URLRequest::ProtocolFactory* orig_http_factory_;
 
   static scoped_ptr<base::Thread> io_thread_;
-  static URLRequestJob* mock_factory_job_;
+  static net::URLRequestJob* mock_factory_job_;
 };
 
 // static
 scoped_ptr<base::Thread> AppCacheRequestHandlerTest::io_thread_;
-URLRequestJob* AppCacheRequestHandlerTest::mock_factory_job_ = NULL;
+net::URLRequestJob* AppCacheRequestHandlerTest::mock_factory_job_ = NULL;
 
 TEST_F(AppCacheRequestHandlerTest, MainResource_Miss) {
   RunTestOnIOThread(&AppCacheRequestHandlerTest::MainResource_Miss);
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 543ece5..f4aacf2 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -41,8 +41,8 @@ class MockHttpServer {
     return GURL("http://mockhost/" + path);
   }
 
-  static URLRequestJob* JobFactory(net::URLRequest* request,
-                                   const std::string& scheme) {
+  static net::URLRequestJob* JobFactory(net::URLRequest* request,
+                                        const std::string& scheme) {
     if (request->url().host() != "mockhost")
       return new URLRequestErrorJob(request, -1);
 
@@ -287,8 +287,8 @@ class MockFrontend : public AppCacheFrontend {
 };
 
 // Helper factories to simulate redirected URL responses for tests.
-static URLRequestJob* RedirectFactory(net::URLRequest* request,
-                                      const std::string& scheme) {
+static net::URLRequestJob* RedirectFactory(net::URLRequest* request,
+                                           const std::string& scheme) {
   return new URLRequestTestJob(request,
                                URLRequestTestJob::test_redirect_headers(),
                                URLRequestTestJob::test_data_1(),
@@ -322,8 +322,8 @@ class RetryRequestTestJob : public URLRequestTestJob {
     expected_requests_ = 0;
   }
 
-  static URLRequestJob* RetryFactory(net::URLRequest* request,
-                                     const std::string& scheme) {
+  static net::URLRequestJob* RetryFactory(net::URLRequest* request,
+                                          const std::string& scheme) {
     ++num_requests_;
     if (num_retries_ > 0 && request->original_url() == kRetryUrl) {
       --num_retries_;
@@ -424,8 +424,8 @@ class HttpHeadersRequestTestJob : public URLRequestTestJob {
     already_checked_ = false;
   }
 
-  static URLRequestJob* IfModifiedSinceFactory(net::URLRequest* request,
-                                               const std::string& scheme) {
+  static net::URLRequestJob* IfModifiedSinceFactory(net::URLRequest* request,
+                                                    const std::string& scheme) {
     if (!already_checked_) {
       already_checked_ = true;  // only check once for a test
       const net::HttpRequestHeaders& extra_headers =
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc
index 6a61674..9dc19ea 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/appcache/appcache_url_request_job.cc
@@ -22,7 +22,7 @@ namespace appcache {
 
 AppCacheURLRequestJob::AppCacheURLRequestJob(
     net::URLRequest* request, AppCacheStorage* storage)
-    : URLRequestJob(request), storage_(storage),
+    : net::URLRequestJob(request), storage_(storage),
       has_been_started_(false), has_been_killed_(false),
       delivery_type_(AWAITING_DELIVERY_ORDERS),
       cache_id_(kNoCacheId), is_fallback_(false),
@@ -197,7 +197,7 @@ void AppCacheURLRequestJob::OnReadComplete(int result) {
   NotifyReadComplete(result);
 }
 
-// URLRequestJob overrides ------------------------------------------------
+// net::URLRequestJob overrides ------------------------------------------------
 
 void AppCacheURLRequestJob::Start() {
   DCHECK(!has_been_started());
@@ -213,7 +213,7 @@ void AppCacheURLRequestJob::Kill() {
       storage_->CancelDelegateCallbacks(this);
       storage_ = NULL;
     }
-    URLRequestJob::Kill();
+    net::URLRequestJob::Kill();
     method_factory_.RevokeAll();
   }
 }
diff --git a/webkit/appcache/appcache_url_request_job.h b/webkit/appcache/appcache_url_request_job.h
index 7491e71..2b97291 100644
--- a/webkit/appcache/appcache_url_request_job.h
+++ b/webkit/appcache/appcache_url_request_job.h
@@ -16,7 +16,7 @@
 
 namespace appcache {
 
-// A URLRequestJob derivative that knows how to return a response stored
+// A net::URLRequestJob derivative that knows how to return a response stored
 // in the appcache.
 class AppCacheURLRequestJob : public net::URLRequestJob,
                               public AppCacheStorage::Delegate {
@@ -55,7 +55,7 @@ class AppCacheURLRequestJob : public net::URLRequestJob,
   int64 cache_id() { return cache_id_; }
   const AppCacheEntry& entry() { return entry_; }
 
-  // URLRequestJob's Kill method is made public so the users of this
+  // net::URLRequestJob's Kill method is made public so the users of this
   // class in the appcache namespace can call it.
   virtual void Kill();
 
@@ -104,7 +104,7 @@ class AppCacheURLRequestJob : public net::URLRequestJob,
   // AppCacheResponseReader completion callback
   void OnReadComplete(int result);
 
-  // URLRequestJob methods, see url_request_job.h for doc comments
+  // net::URLRequestJob methods, see url_request_job.h for doc comments
   virtual void Start();
   virtual net::LoadState GetLoadState() const;
   virtual bool GetCharset(std::string* charset);
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index b64f079b..a282b42 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -124,10 +124,10 @@ class AppCacheURLRequestJobTest : public testing::Test {
     bool kill_with_io_pending_;
   };
 
-  static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
-                                           const std::string& scheme) {
+  static net::URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
+                                                const std::string& scheme) {
     if (mock_factory_job_) {
-      URLRequestJob* temp = mock_factory_job_;
+      net::URLRequestJob* temp = mock_factory_job_;
       mock_factory_job_ = NULL;
       return temp;
     } else {
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h
index 0131da2..d9a705a 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/appcache/view_appcache_internals_job.h
@@ -30,7 +30,7 @@ class ViewAppCacheInternalsJob : public URLRequestSimpleJob {
                        std::string* charset,
                        std::string* data) const;
 
-  // Overridden method from URLRequestJob.
+  // Overridden method from net::URLRequestJob.
   virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
 
  private:
diff --git a/webkit/blob/blob_url_request_job.cc b/webkit/blob/blob_url_request_job.cc
index bbe26be..4fb5611 100644
--- a/webkit/blob/blob_url_request_job.cc
+++ b/webkit/blob/blob_url_request_job.cc
@@ -44,7 +44,7 @@ BlobURLRequestJob::BlobURLRequestJob(
     net::URLRequest* request,
     BlobData* blob_data,
     base::MessageLoopProxy* file_thread_proxy)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       blob_data_(blob_data),
       file_thread_proxy_(file_thread_proxy),
@@ -92,7 +92,7 @@ void BlobURLRequestJob::DidStart() {
 void BlobURLRequestJob::Kill() {
   stream_.Close();
 
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
   callback_factory_.RevokeAll();
   method_factory_.RevokeAll();
 }
diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h
index c82ebfc..2dec522 100644
--- a/webkit/blob/blob_url_request_job.h
+++ b/webkit/blob/blob_url_request_job.h
@@ -31,7 +31,7 @@ class BlobURLRequestJob : public net::URLRequestJob {
                     base::MessageLoopProxy* resolving_message_loop_proxy);
   virtual ~BlobURLRequestJob();
 
-  // URLRequestJob methods.
+  // net::URLRequestJob methods.
   virtual void Start();
   virtual void Kill();
   virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read);
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 65b1e91..a81f378 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -150,8 +150,9 @@ class BlobURLRequestJobTest : public testing::Test {
     io_thread_.reset(NULL);
   }
 
-  static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
-                                                 const std::string& scheme) {
+  static net::URLRequestJob* BlobURLRequestJobFactory(
+      net::URLRequest* request,
+      const std::string& scheme) {
     BlobURLRequestJob* temp = blob_url_request_job_;
     blob_url_request_job_ = NULL;
     return temp;
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 73e4bb2..079968e 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -97,8 +97,8 @@ struct TestShellRequestContextParams {
   bool accept_all_cookies;
 };
 
-static URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
-                                               const std::string& scheme) {
+static net::URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
+                                                    const std::string& scheme) {
   webkit_blob::BlobStorageController* blob_storage_controller =
       static_cast<TestShellRequestContext*>(request->context())->
           blob_storage_controller();
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index cb1e007..81c6886 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -86,8 +86,8 @@ const int kSVGTestWindowHeight = 360;
 // URLRequestTestShellFileJob is used to serve the inspector
 class URLRequestTestShellFileJob : public URLRequestFileJob {
  public:
-  static URLRequestJob* InspectorFactory(net::URLRequest* request,
-                                         const std::string& scheme) {
+  static net::URLRequestJob* InspectorFactory(net::URLRequest* request,
+                                              const std::string& scheme) {
     FilePath path;
     PathService::Get(base::DIR_EXE, &path);
     path = path.AppendASCII("resources");