net: Remove typedef net::URLRequest URLRequest;

BUG=64263
TEST=compiled locally, trybots

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

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

26 files changed, 74 insertions, 72 deletions

diff --git a/chrome/browser/net/blob_url_request_job_factory.cc b/chrome/browser/net/blob_url_request_job_factory.cc
index d2e9bff..798c21b 100644
--- a/chrome/browser/net/blob_url_request_job_factory.cc
+++ b/chrome/browser/net/blob_url_request_job_factory.cc
@@ -15,7 +15,7 @@
 
 namespace {
 
-URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
+URLRequestJob* BlobURLRequestJobFactory(net::URLRequest* request,
                                         const std::string& scheme) {
   scoped_refptr<webkit_blob::BlobData> data;
   ResourceDispatcherHostRequestInfo* info =
@@ -37,6 +37,6 @@ URLRequestJob* BlobURLRequestJobFactory(URLRequest* request,
 }
 
 void RegisterBlobURLRequestJobFactory() {
-  URLRequest::RegisterProtocolFactory(chrome::kBlobScheme,
+  net::URLRequest::RegisterProtocolFactory(chrome::kBlobScheme,
                                       &BlobURLRequestJobFactory);
 }
diff --git a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
index e9bcf2f..fe0ca9d 100644
--- a/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
+++ b/chrome/browser/net/chrome_dns_cert_provenance_checker.cc
@@ -48,7 +48,7 @@ class ChromeDnsCertProvenanceChecker :
       const std::vector<std::string>& der_certs) {
     const std::string report = BuildEncryptedReport(hostname, der_certs);
 
-    URLRequest* url_request(new URLRequest(upload_url_, &delegate_));
+    net::URLRequest* url_request(new net::URLRequest(upload_url_, &delegate_));
     url_request->set_context(url_req_context_);
     url_request->set_method("POST");
     url_request->AppendBytesToUpload(report.data(), report.size());
@@ -61,8 +61,8 @@ class ChromeDnsCertProvenanceChecker :
   }
 
  private:
-  void RequestComplete(URLRequest* request) {
-    std::set<URLRequest*>::iterator i = inflight_requests_.find(request);
+  void RequestComplete(net::URLRequest* request) {
+    std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request);
     DCHECK(i != inflight_requests_.end());
     delete *i;
     inflight_requests_.erase(i);
@@ -71,14 +71,14 @@ class ChromeDnsCertProvenanceChecker :
   // URLRequestDelegate is the delegate for the upload. Since this is a
   // fire-and-forget operation, we don't care if there are any errors in the
   // upload.
-  class URLRequestDelegate : public URLRequest::Delegate {
+  class URLRequestDelegate : public net::URLRequest::Delegate {
    public:
     explicit URLRequestDelegate(ChromeDnsCertProvenanceChecker* checker)
         : checker_(checker) {
     }
 
     // Delegate implementation
-    void OnResponseStarted(URLRequest* request) {
+    void OnResponseStarted(net::URLRequest* request) {
       const URLRequestStatus& status(request->status());
       if (!status.is_success()) {
         LOG(WARNING) << "Certificate upload failed"
@@ -91,7 +91,7 @@ class ChromeDnsCertProvenanceChecker :
       checker_->RequestComplete(request);
     }
 
-    void OnReadCompleted(URLRequest* request, int bytes_read) {
+    void OnReadCompleted(net::URLRequest* request, int bytes_read) {
       NOTREACHED();
     }
 
@@ -103,7 +103,7 @@ class ChromeDnsCertProvenanceChecker :
   ChromeURLRequestContext* const url_req_context_;
   const GURL upload_url_;
   URLRequestDelegate delegate_;
-  std::set<URLRequest*> inflight_requests_;
+  std::set<net::URLRequest*> inflight_requests_;
 };
 
 }  // namespace
diff --git a/chrome/browser/net/connect_interceptor.cc b/chrome/browser/net/connect_interceptor.cc
index 893039b..3809da2 100644
--- a/chrome/browser/net/connect_interceptor.cc
+++ b/chrome/browser/net/connect_interceptor.cc
@@ -10,11 +10,11 @@
 namespace chrome_browser_net {
 
 ConnectInterceptor::ConnectInterceptor() {
-  URLRequest::RegisterRequestInterceptor(this);
+  net::URLRequest::RegisterRequestInterceptor(this);
 }
 
 ConnectInterceptor::~ConnectInterceptor() {
-  URLRequest::UnregisterRequestInterceptor(this);
+  net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
 net::URLRequestJob* ConnectInterceptor::MaybeIntercept(
diff --git a/chrome/browser/net/connect_interceptor.h b/chrome/browser/net/connect_interceptor.h
index ee4422b..b0b15f1 100644
--- a/chrome/browser/net/connect_interceptor.h
+++ b/chrome/browser/net/connect_interceptor.h
@@ -13,7 +13,7 @@ namespace chrome_browser_net {
 //------------------------------------------------------------------------------
 // An interceptor to monitor URLRequests so that we can do speculative DNS
 // resolution and/or speculative TCP preconnections.
-class ConnectInterceptor : public URLRequest::Interceptor {
+class ConnectInterceptor : public net::URLRequest::Interceptor {
  public:
   // Construction includes registration as an URL.
   ConnectInterceptor();
@@ -21,7 +21,7 @@ class ConnectInterceptor : public URLRequest::Interceptor {
   virtual ~ConnectInterceptor();
 
  protected:
-  // URLRequest::Interceptor overrides
+  // Overridden from net::URLRequest::Interceptor:
   // Learn about referrers, and optionally preconnect based on history.
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc
index 35a9a71..7b34aea 100644
--- a/chrome/browser/net/connection_tester.cc
+++ b/chrome/browser/net/connection_tester.cc
@@ -223,7 +223,7 @@ class ExperimentURLRequestContext : public URLRequestContext {
 
 // TestRunner is a helper class for running an individual experiment. It can
 // be deleted any time after it is started, and this will abort the request.
-class ConnectionTester::TestRunner : public URLRequest::Delegate {
+class ConnectionTester::TestRunner : public net::URLRequest::Delegate {
  public:
   // |tester| must remain alive throughout the TestRunner's lifetime.
   // |tester| will be notified of completion.
@@ -233,9 +233,9 @@ class ConnectionTester::TestRunner : public URLRequest::Delegate {
   // it is done.
   void Run(const Experiment& experiment);
 
-  // URLRequest::Delegate implementation.
-  virtual void OnResponseStarted(URLRequest* request);
-  virtual void OnReadCompleted(URLRequest* request, int bytes_read);
+  // Overridden from net::URLRequest::Delegate:
+  virtual void OnResponseStarted(net::URLRequest* request);
+  virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
   // TODO(eroman): handle cases requiring authentication.
 
  private:
@@ -244,18 +244,18 @@ class ConnectionTester::TestRunner : public URLRequest::Delegate {
 
   // Starts reading the response's body (and keeps reading until an error or
   // end of stream).
-  void ReadBody(URLRequest* request);
+  void ReadBody(net::URLRequest* request);
 
   // Called when the request has completed (for both success and failure).
-  void OnResponseCompleted(URLRequest* request);
+  void OnResponseCompleted(net::URLRequest* request);
 
   ConnectionTester* tester_;
-  scoped_ptr<URLRequest> request_;
+  scoped_ptr<net::URLRequest> request_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
-void ConnectionTester::TestRunner::OnResponseStarted(URLRequest* request) {
+void ConnectionTester::TestRunner::OnResponseStarted(net::URLRequest* request) {
   if (!request->status().is_success()) {
     OnResponseCompleted(request);
     return;
@@ -265,7 +265,7 @@ void ConnectionTester::TestRunner::OnResponseStarted(URLRequest* request) {
   ReadBody(request);
 }
 
-void ConnectionTester::TestRunner::OnReadCompleted(URLRequest* request,
+void ConnectionTester::TestRunner::OnReadCompleted(net::URLRequest* request,
                                                    int bytes_read) {
   if (bytes_read <= 0) {
     OnResponseCompleted(request);
@@ -276,7 +276,7 @@ void ConnectionTester::TestRunner::OnReadCompleted(URLRequest* request,
   ReadBody(request);
 }
 
-void ConnectionTester::TestRunner::ReadBody(URLRequest* request) {
+void ConnectionTester::TestRunner::ReadBody(net::URLRequest* request) {
   // Read the response body |kReadBufferSize| bytes at a time.
   scoped_refptr<net::IOBuffer> unused_buffer(
       new net::IOBuffer(kReadBufferSize));
@@ -289,7 +289,8 @@ void ConnectionTester::TestRunner::ReadBody(URLRequest* request) {
   }
 }
 
-void ConnectionTester::TestRunner::OnResponseCompleted(URLRequest* request) {
+void ConnectionTester::TestRunner::OnResponseCompleted(
+    net::URLRequest* request) {
   int result = net::OK;
   if (!request->status().is_success()) {
     DCHECK_NE(net::ERR_IO_PENDING, request->status().os_error());
@@ -310,7 +311,7 @@ void ConnectionTester::TestRunner::Run(const Experiment& experiment) {
   }
 
   // Fetch a request using the experimental context.
-  request_.reset(new URLRequest(experiment.url, this));
+  request_.reset(new net::URLRequest(experiment.url, this));
   request_->set_context(context);
   request_->Start();
 }
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc
index d93ccf8..f5b27d5 100644
--- a/chrome/browser/net/load_timing_observer.cc
+++ b/chrome/browser/net/load_timing_observer.cc
@@ -82,7 +82,7 @@ void LoadTimingObserver::OnAddEntry(net::NetLog::EventType type,
 }
 
 // static
-void LoadTimingObserver::PopulateTimingInfo(URLRequest* request,
+void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
                                             ResourceResponse* response) {
   if (!(request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING))
     return;
diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc
index 8ded133..98c50be 100644
--- a/chrome/browser/net/load_timing_observer_unittest.cc
+++ b/chrome/browser/net/load_timing_observer_unittest.cc
@@ -81,7 +81,7 @@ void AddEndSocketEntries(LoadTimingObserver& observer, uint32 id) {
 
 }  // namespace
 
-// Test that URLRequest with no load timing flag is not processed.
+// Test that net::URLRequest with no load timing flag is not processed.
 TEST(LoadTimingObserverTest, NoLoadTimingEnabled) {
   LoadTimingObserver observer;
 
diff --git a/chrome/browser/net/metadata_url_request.cc b/chrome/browser/net/metadata_url_request.cc
index dacfc5d..0f69d6d 100644
--- a/chrome/browser/net/metadata_url_request.cc
+++ b/chrome/browser/net/metadata_url_request.cc
@@ -19,9 +19,10 @@ namespace {
 
 class MetadataRequestHandler : public net::URLRequestJob {
  public:
-  explicit MetadataRequestHandler(URLRequest* request);
+  explicit MetadataRequestHandler(net::URLRequest* request);
 
-  static URLRequestJob* Factory(URLRequest* request, const std::string& scheme);
+  static URLRequestJob* Factory(net::URLRequest* request,
+                                const std::string& scheme);
 
   // URLRequestJob implementation.
   virtual void Start();
@@ -39,7 +40,7 @@ class MetadataRequestHandler : public net::URLRequestJob {
   DISALLOW_COPY_AND_ASSIGN(MetadataRequestHandler);
 };
 
-MetadataRequestHandler::MetadataRequestHandler(URLRequest* request)
+MetadataRequestHandler::MetadataRequestHandler(net::URLRequest* request)
     : URLRequestJob(request),
       data_offset_(0) {
   parsed = false;
@@ -48,7 +49,7 @@ MetadataRequestHandler::MetadataRequestHandler(URLRequest* request)
 MetadataRequestHandler::~MetadataRequestHandler() {
 }
 
-URLRequestJob* MetadataRequestHandler::Factory(URLRequest* request,
+URLRequestJob* MetadataRequestHandler::Factory(net::URLRequest* request,
                                                const std::string& scheme) {
   return new MetadataRequestHandler(request);
 }
@@ -125,7 +126,7 @@ void MetadataRequestHandler::StartAsync() {
 
 void RegisterMetadataURLRequestHandler() {
 #if defined(OS_CHROMEOS)
-  URLRequest::RegisterProtocolFactory(chrome::kMetadataScheme,
-                                      &MetadataRequestHandler::Factory);
+  net::URLRequest::RegisterProtocolFactory(chrome::kMetadataScheme,
+                                           &MetadataRequestHandler::Factory);
 #endif
 }
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 5d46fb3..164aa66 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -237,7 +237,7 @@ class PassiveLogCollector : public ChromeNetLog::Observer {
     DISALLOW_COPY_AND_ASSIGN(SocketTracker);
   };
 
-  // Specialization of SourceTracker for handling URLRequest/SocketStream.
+  // Specialization of SourceTracker for handling net::URLRequest/SocketStream.
   class RequestTracker : public SourceTracker {
    public:
     static const size_t kMaxNumSources;
diff --git a/chrome/browser/net/prerender_interceptor.cc b/chrome/browser/net/prerender_interceptor.cc
index c1e5698..6e082f7 100644
--- a/chrome/browser/net/prerender_interceptor.cc
+++ b/chrome/browser/net/prerender_interceptor.cc
@@ -21,17 +21,17 @@ PrerenderInterceptor::PrerenderInterceptor()
     : ALLOW_THIS_IN_INITIALIZER_LIST(
         callback_(NewCallback(this,
                               &PrerenderInterceptor::PrerenderDispatch))) {
-  URLRequest::RegisterRequestInterceptor(this);
+  net::URLRequest::RegisterRequestInterceptor(this);
 }
 
 PrerenderInterceptor::PrerenderInterceptor(
     PrerenderInterceptorCallback* callback)
-  : callback_(callback) {
-  URLRequest::RegisterRequestInterceptor(this);
+    : callback_(callback) {
+  net::URLRequest::RegisterRequestInterceptor(this);
 }
 
 PrerenderInterceptor::~PrerenderInterceptor() {
-  URLRequest::UnregisterRequestInterceptor(this);
+  net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
 net::URLRequestJob* PrerenderInterceptor::MaybeIntercept(
diff --git a/chrome/browser/net/prerender_interceptor.h b/chrome/browser/net/prerender_interceptor.h
index 02cdbff..18f3eec 100644
--- a/chrome/browser/net/prerender_interceptor.h
+++ b/chrome/browser/net/prerender_interceptor.h
@@ -18,12 +18,12 @@ namespace chrome_browser_net {
 // The PrerenderInterceptor watches prefetch requests, and when
 // they are for type text/html, notifies the prerendering
 // system about the fetch so it may consider the URL.
-class PrerenderInterceptor : public URLRequest::Interceptor {
+class PrerenderInterceptor : public net::URLRequest::Interceptor {
  public:
   PrerenderInterceptor();
   virtual ~PrerenderInterceptor();
 
-  // URLRequest::Interceptor overrides.  We only care about
+  // net::URLRequest::Interceptor overrides.  We only care about
   // MaybeInterceptResponse, but must capture MaybeIntercept since
   // it is pure virtual.
   virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
diff --git a/chrome/browser/net/prerender_interceptor_unittest.cc b/chrome/browser/net/prerender_interceptor_unittest.cc
index 55e5a31..761978d 100644
--- a/chrome/browser/net/prerender_interceptor_unittest.cc
+++ b/chrome/browser/net/prerender_interceptor_unittest.cc
@@ -30,7 +30,7 @@ class PrerenderInterceptorTest : public testing::Test {
   net::TestServer test_server_;
   GURL gurl_;
   GURL last_intercepted_gurl_;
-  scoped_ptr<URLRequest> req_;
+  scoped_ptr<net::URLRequest> req_;
 
  private:
   void SetLastInterceptedGurl(const GURL& url);
diff --git a/chrome/browser/net/url_request_failed_dns_job.cc b/chrome/browser/net/url_request_failed_dns_job.cc
index e436204..b97a6b1 100644
--- a/chrome/browser/net/url_request_failed_dns_job.cc
+++ b/chrome/browser/net/url_request_failed_dns_job.cc
@@ -26,7 +26,7 @@ void URLRequestFailedDnsJob::AddUrlHandler() {
 }
 
 /*static */
-URLRequestJob* URLRequestFailedDnsJob::Factory(URLRequest* request,
+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 4029605..22fe5bf 100644
--- a/chrome/browser/net/url_request_mock_http_job.cc
+++ b/chrome/browser/net/url_request_mock_http_job.cc
@@ -21,7 +21,7 @@ static const FilePath::CharType kMockHeaderFileSuffix[] =
 FilePath URLRequestMockHTTPJob::base_path_;
 
 /* static */
-URLRequestJob* URLRequestMockHTTPJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockHTTPJob::Factory(net::URLRequest* request,
                                               const std::string& scheme) {
   return new URLRequestMockHTTPJob(request,
                                    GetOnDiskPath(base_path_, request, scheme));
@@ -56,7 +56,7 @@ GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) {
 
 /* static */
 FilePath URLRequestMockHTTPJob::GetOnDiskPath(const FilePath& base_path,
-                                              URLRequest* request,
+                                              net::URLRequest* request,
                                               const std::string& scheme) {
   std::string file_url("file:///");
   file_url += WideToUTF8(base_path.ToWStringHack());
@@ -68,7 +68,7 @@ FilePath URLRequestMockHTTPJob::GetOnDiskPath(const FilePath& base_path,
   return file_path;
 }
 
-URLRequestMockHTTPJob::URLRequestMockHTTPJob(URLRequest* request,
+URLRequestMockHTTPJob::URLRequestMockHTTPJob(net::URLRequest* request,
                                              const FilePath& file_path)
     : URLRequestFileJob(request, file_path) { }
 
diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
index 35a251c..d2c0e0b 100644
--- a/chrome/browser/net/url_request_mock_http_job.h
+++ b/chrome/browser/net/url_request_mock_http_job.h
@@ -16,14 +16,14 @@ class FilePath;
 
 class URLRequestMockHTTPJob : public URLRequestFileJob {
  public:
-  URLRequestMockHTTPJob(URLRequest* request, const FilePath& file_path);
+  URLRequestMockHTTPJob(net::URLRequest* request, const FilePath& file_path);
 
   virtual bool GetMimeType(std::string* mime_type) const;
   virtual bool GetCharset(std::string* charset);
   virtual void GetResponseInfo(net::HttpResponseInfo* info);
   virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
 
-  static URLRequest::ProtocolFactory Factory;
+  static net::URLRequest::ProtocolFactory Factory;
 
   // Adds the testing URLs to the URLRequestFilter.
   static void AddUrlHandler(const FilePath& base_path);
@@ -39,7 +39,7 @@ class URLRequestMockHTTPJob : public URLRequestFileJob {
   virtual ~URLRequestMockHTTPJob() { }
 
   static FilePath GetOnDiskPath(const FilePath& base_path,
-                                URLRequest* request,
+                                net::URLRequest* request,
                                 const std::string& scheme);
 
  private:
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 e34baa9..66d7e3f 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.cc
@@ -22,7 +22,7 @@ FilePath GetMockFilePath() {
 }  // namespace
 
 /* static */
-URLRequestJob* URLRequestMockLinkDoctorJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockLinkDoctorJob::Factory(net::URLRequest* request,
                                                     const std::string& scheme) {
   return new URLRequestMockLinkDoctorJob(request);
 }
@@ -35,6 +35,7 @@ void URLRequestMockLinkDoctorJob::AddUrlHandler() {
                              URLRequestMockLinkDoctorJob::Factory);
 }
 
-URLRequestMockLinkDoctorJob::URLRequestMockLinkDoctorJob(URLRequest* request)
+URLRequestMockLinkDoctorJob::URLRequestMockLinkDoctorJob(
+    net::URLRequest* request)
     : URLRequestMockHTTPJob(request, GetMockFilePath()) {
 }
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 4af4fe7..19a02f4 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -12,9 +12,9 @@
 
 class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
  public:
-  explicit URLRequestMockLinkDoctorJob(URLRequest* request);
+  explicit URLRequestMockLinkDoctorJob(net::URLRequest* request);
 
-  static URLRequest::ProtocolFactory Factory;
+  static net::URLRequest::ProtocolFactory Factory;
 
   // Adds the testing URLs to the URLRequestFilter.
   static void AddUrlHandler();
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 f4aa330..51094d6 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -57,7 +57,7 @@ void URLRequestMockNetErrorJob::RemoveMockedURL(const GURL& url) {
 }
 
 // static
-URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestMockNetErrorJob::Factory(net::URLRequest* request,
                                                   const std::string& scheme) {
   GURL url = request->url();
 
@@ -80,7 +80,7 @@ URLRequestJob* URLRequestMockNetErrorJob::Factory(URLRequest* request,
                                        file_path);
 }
 
-URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(URLRequest* request,
+URLRequestMockNetErrorJob::URLRequestMockNetErrorJob(net::URLRequest* request,
     const std::vector<int>& errors, net::X509Certificate* cert,
     const FilePath& file_path)
     : URLRequestMockHTTPJob(request, file_path),
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 059272f..3416bd9 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -14,7 +14,7 @@
 
 class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
  public:
-  URLRequestMockNetErrorJob(URLRequest* request,
+  URLRequestMockNetErrorJob(net::URLRequest* request,
                             const std::vector<int>& errors,
                             net::X509Certificate* ssl_cert,
                             const FilePath& file_path);
@@ -39,7 +39,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
  private:
   ~URLRequestMockNetErrorJob();
 
-  static URLRequest::ProtocolFactory Factory;
+  static net::URLRequest::ProtocolFactory Factory;
 
   void StartAsync();
 
diff --git a/chrome/browser/net/url_request_mock_util.cc b/chrome/browser/net/url_request_mock_util.cc
index b3ac398..ce32af3 100644
--- a/chrome/browser/net/url_request_mock_util.cc
+++ b/chrome/browser/net/url_request_mock_util.cc
@@ -20,8 +20,8 @@
 namespace chrome_browser_net {
 
 void SetUrlRequestMocksEnabled(bool enabled) {
-  // Since this involves changing the URLRequest ProtocolFactory, we need to
-  // run on the IO thread.
+  // Since this involves changing the net::URLRequest ProtocolFactory, we need
+  // to run on the IO thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (enabled) {
diff --git a/chrome/browser/net/url_request_slow_download_job.cc b/chrome/browser/net/url_request_slow_download_job.cc
index 138a57c..a9cae93 100644
--- a/chrome/browser/net/url_request_slow_download_job.cc
+++ b/chrome/browser/net/url_request_slow_download_job.cc
@@ -42,7 +42,7 @@ void URLRequestSlowDownloadJob::AddUrlHandler() {
 }
 
 /*static */
-URLRequestJob* URLRequestSlowDownloadJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestSlowDownloadJob::Factory(net::URLRequest* request,
     const std::string& scheme) {
   URLRequestSlowDownloadJob* job = new URLRequestSlowDownloadJob(request);
   if (request->url().spec() != kFinishDownloadUrl)
@@ -60,7 +60,7 @@ void URLRequestSlowDownloadJob::FinishPendingRequests() {
   kPendingRequests.clear();
 }
 
-URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(URLRequest* request)
+URLRequestSlowDownloadJob::URLRequestSlowDownloadJob(net::URLRequest* request)
   : URLRequestJob(request),
     first_download_size_remaining_(kFirstDownloadSize),
     should_finish_download_(false),
diff --git a/chrome/browser/net/url_request_slow_http_job.cc b/chrome/browser/net/url_request_slow_http_job.cc
index a8205f0..12065ab 100644
--- a/chrome/browser/net/url_request_slow_http_job.cc
+++ b/chrome/browser/net/url_request_slow_http_job.cc
@@ -19,7 +19,7 @@ const int URLRequestSlowHTTPJob::kDelayMs = 1000;
 using base::TimeDelta;
 
 /* static */
-URLRequestJob* URLRequestSlowHTTPJob::Factory(URLRequest* request,
+URLRequestJob* URLRequestSlowHTTPJob::Factory(net::URLRequest* request,
                                               const std::string& scheme) {
   return new URLRequestSlowHTTPJob(request,
                                    GetOnDiskPath(base_path_, request, scheme));
@@ -44,7 +44,7 @@ GURL URLRequestSlowHTTPJob::GetMockUrl(const FilePath& path) {
   return GURL(url);
 }
 
-URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(URLRequest* request,
+URLRequestSlowHTTPJob::URLRequestSlowHTTPJob(net::URLRequest* request,
                                              const FilePath& file_path)
     : URLRequestMockHTTPJob(request, file_path) { }
 
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index fab7a01..e58f8df 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -13,11 +13,11 @@
 
 class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
  public:
-  URLRequestSlowHTTPJob(URLRequest* request, const FilePath& file_path);
+  URLRequestSlowHTTPJob(net::URLRequest* request, const FilePath& file_path);
 
   static const int kDelayMs;
 
-  static URLRequest::ProtocolFactory Factory;
+  static net::URLRequest::ProtocolFactory Factory;
 
   // Adds the testing URLs to the URLRequestFilter.
   static void AddUrlHandler(const FilePath& base_path);
diff --git a/chrome/browser/net/url_request_tracking.cc b/chrome/browser/net/url_request_tracking.cc
index 60ad7d2..a931856 100644
--- a/chrome/browser/net/url_request_tracking.cc
+++ b/chrome/browser/net/url_request_tracking.cc
@@ -13,7 +13,7 @@ namespace {
 // PID.
 const void* kOriginProcessUniqueIDKey = 0;
 
-class UniqueIDData : public URLRequest::UserData {
+class UniqueIDData : public net::URLRequest::UserData {
  public:
   explicit UniqueIDData(int id) : id_(id) {}
   virtual ~UniqueIDData() {}
@@ -31,12 +31,12 @@ class UniqueIDData : public URLRequest::UserData {
 
 namespace chrome_browser_net {
 
-void SetOriginProcessUniqueIDForRequest(int id, URLRequest* request) {
+void SetOriginProcessUniqueIDForRequest(int id, net::URLRequest* request) {
   // The request will take ownership.
   request->SetUserData(&kOriginProcessUniqueIDKey, new UniqueIDData(id));
 }
 
-int GetOriginProcessUniqueIDForRequest(const URLRequest* request) {
+int GetOriginProcessUniqueIDForRequest(const net::URLRequest* request) {
   const UniqueIDData* data = static_cast<const UniqueIDData*>(
       request->GetUserData(&kOriginProcessUniqueIDKey));
   if (!data)
diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc
index 847d70d..4fdbefc 100644
--- a/chrome/browser/net/view_blob_internals_job_factory.cc
+++ b/chrome/browser/net/view_blob_internals_job_factory.cc
@@ -19,11 +19,10 @@ bool ViewBlobInternalsJobFactory::IsSupportedURL(const GURL& url) {
 
 // static.
 URLRequestJob* ViewBlobInternalsJobFactory::CreateJobForRequest(
-    URLRequest* request) {
+    net::URLRequest* request) {
   webkit_blob::BlobStorageController* blob_storage_controller =
       static_cast<ChromeURLRequestContext*>(request->context())->
           blob_storage_context()->controller();
   return new webkit_blob::ViewBlobInternalsJob(
       request, blob_storage_controller);
 }
-
diff --git a/chrome/browser/net/view_http_cache_job_factory.cc b/chrome/browser/net/view_http_cache_job_factory.cc
index 8e14a11..8703877 100644
--- a/chrome/browser/net/view_http_cache_job_factory.cc
+++ b/chrome/browser/net/view_http_cache_job_factory.cc
@@ -18,7 +18,7 @@ namespace {
 // A job subclass that dumps an HTTP cache entry.
 class ViewHttpCacheJob : public net::URLRequestJob {
  public:
-  explicit ViewHttpCacheJob(URLRequest* request)
+  explicit ViewHttpCacheJob(net::URLRequest* request)
       : URLRequestJob(request), data_offset_(0), cancel_(false), busy_(false),
         ALLOW_THIS_IN_INITIALIZER_LIST(
             callback_(this, &ViewHttpCacheJob::OnIOComplete)) {}
@@ -124,6 +124,6 @@ bool ViewHttpCacheJobFactory::IsSupportedURL(const GURL& url) {
 
 // Static.
 URLRequestJob* ViewHttpCacheJobFactory::CreateJobForRequest(
-    URLRequest* request) {
+    net::URLRequest* request) {
   return new ViewHttpCacheJob(request);
 }