Switch to using URLRequestContextBuilder to create some URLRequestContexts.

chrome/service/net/service_url_request_context_getter.h

Index: chrome/service/net/service_url_request_context_getter.h
diff --git a/chrome/service/net/service_url_request_context.h b/chrome/service/net/service_url_request_context_getter.h
similarity index 67%
rename from chrome/service/net/service_url_request_context.h
rename to chrome/service/net/service_url_request_context_getter.h
index c409ede1575235d8c26782c375078516cb609a21..f2000fc5bd964d12bf0268d649d5a8ad713a854f 100644
--- a/chrome/service/net/service_url_request_context.h
+++ b/chrome/service/net/service_url_request_context_getter.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.
 
-#ifndef CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_H_
-#define CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_H_
+#ifndef CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_
+#define CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_
 
 #include <string>
 
@@ -28,23 +28,6 @@ namespace net {
 class ProxyConfigService;
 }
 
-// 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:
-  // This context takes ownership of |net_proxy_config_service|.
-  explicit ServiceURLRequestContext(
-      const std::string& user_agent,
-      net::ProxyConfigService* net_proxy_config_service);
-
-  virtual ~ServiceURLRequestContext();
-
- private:
-  net::URLRequestContextStorage storage_;
-};
-
 class ServiceURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
@@ -69,4 +52,4 @@ class ServiceURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_ptr<net::URLRequestContext> url_request_context_;
 };
 
-#endif  // CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_H_
+#endif  // CHROME_SERVICE_NET_SERVICE_URL_REQUEST_CONTEXT_GETTER_H_