net: Remove typedef net::URLRequestContext URLRequestContext;

BUG=64263
TEST=compiled locally, trybots

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

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

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
index 53658cd..50ecaab 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc
@@ -32,7 +32,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
           : io_message_loop_proxy_(io_message_loop_proxy) {
     g_request_context_getter_instances++;
   }
-  virtual URLRequestContext* GetURLRequestContext() {
+  virtual net::URLRequestContext* GetURLRequestContext() {
     if (!context_)
       context_ = new TestURLRequestContext();
     return context_;
@@ -49,7 +49,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter {
     g_request_context_getter_instances--;
   }
 
-  scoped_refptr<URLRequestContext> context_;
+  scoped_refptr<net::URLRequestContext> context_;
 };
 
 class TestCloudPrintURLFetcher : public CloudPrintURLFetcher {
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index 46d3b7c..e655489 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -148,7 +148,7 @@ const std::string& ServiceURLRequestContext::GetUserAgent(
   // If the user agent is set explicitly return that, otherwise call the
   // base class method to return default value.
   return user_agent_.empty() ?
-      URLRequestContext::GetUserAgent(url) : user_agent_;
+      net::URLRequestContext::GetUserAgent(url) : user_agent_;
 }
 
 ServiceURLRequestContext::~ServiceURLRequestContext() {
@@ -166,7 +166,7 @@ ServiceURLRequestContextGetter::ServiceURLRequestContextGetter()
   user_agent_ = MakeUserAgentForServiceProcess();
 }
 
-URLRequestContext*
+net::URLRequestContext*
 ServiceURLRequestContextGetter::GetURLRequestContext() {
   if (!url_request_context_)
     url_request_context_ = new ServiceURLRequestContext(user_agent_);
diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context.h
index 4e6e296..47d5c23e 100644
--- a/chrome/service/net/service_url_request_context.h
+++ b/chrome/service/net/service_url_request_context.h
@@ -25,9 +25,9 @@ namespace base {
 class MessageLoopProxy;
 }
 
-// Subclass of URLRequestContext which can be used to store extra information
-// for requests. This subclass is meant to be used in the service process where
-// the profile is not available.
+// Subclass of net::URLRequestContext which can be used to store extra
+// information for requests. This subclass is meant to be used in the service
+// process where the profile is not available.
 //
 class ServiceURLRequestContext : public net::URLRequestContext {
  public:
@@ -36,7 +36,7 @@ class ServiceURLRequestContext : public net::URLRequestContext {
     cookie_policy_ = policy;
   }
 
-  // URLRequestContext overrides
+  // Overridden from net::URLRequestContext:
   virtual const std::string& GetUserAgent(const GURL& url) const;
 
  protected: