Switch to using URLRequestContextBuilder to create some URLRequestContexts.

remoting/base/url_request_context_getter.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_BASE_URL_REQUEST_CONTEXT_H_
-#define REMOTING_BASE_URL_REQUEST_CONTEXT_H_
+#ifndef REMOTING_BASE_URL_REQUEST_CONTEXT_GETTER_H_
+#define REMOTING_BASE_URL_REQUEST_CONTEXT_GETTER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context_storage.h"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace remoting {
 
-// Subclass of net::URLRequestContext which can be used to store extra
-// information for requests. This subclass is meant to be used in the
-// remoting Me2Me host process where the profile is not available.
-class URLRequestContext : public net::URLRequestContext {
- public:
-  explicit URLRequestContext(
-      scoped_ptr<net::ProxyConfigService> proxy_config_service);
-
- private:
-  virtual ~URLRequestContext();
-
-  net::URLRequestContextStorage storage_;
-
-  DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
-};
-
 class URLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   URLRequestContextGetter(
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner);
 
   // Overridden from net::URLRequestContextGetter:
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
       GetNetworkTaskRunner() const OVERRIDE;
 
  protected:
   virtual ~URLRequestContextGetter();
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetter);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_BASE_URL_REQUEST_CONTEXT_H_
+#endif  // REMOTING_BASE_URL_REQUEST_CONTEXT_GETTER_H_