Moved data reduction proxy initialization logic to ProfileImplIOData

android_webview/browser/net/aw_url_request_context_getter.h

 // Copyright (c) 2012 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 ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
 #define ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/http/http_network_session.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job_factory.h"
 
 namespace net {
 class CookieStore;
 class HttpTransactionFactory;
 class ProxyConfigService;
 class URLRequestContext;
 class URLRequestJobFactory;
 }
 
 namespace data_reduction_proxy {
+class DataReductionProxyAuthRequestHandler;
 class DataReductionProxyConfigService;
 }
 
-using data_reduction_proxy::DataReductionProxyConfigService;
-
 namespace android_webview {
 
 class AwNetworkDelegate;
 
 class AwURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
-  AwURLRequestContextGetter(const base::FilePath& partition_path,
-                            net::CookieStore* cookie_store);
+  AwURLRequestContextGetter(
+      const base::FilePath& partition_path,
+      net::CookieStore* cookie_store,
+      scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService>

[sgurun-gerrit only, 2014/08/05 01:26:35]

use using to reduce clunkiness in names while reading them

[bengr, 2014/08/05 02:35:07]

People are split on whether "using" is helpful, particularly in headers. It
removes context. I'm leaving as is.

[willchan no longer on Chromium, 2014/08/05 03:03:52]

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Namesp...
covers this. It's disallowed in header files unless scoped within functions,
methods or classes. And only using-declarations are allowed to bring specific
symbols in. You can't bring in the entire namespace via a using-directive.

+          config_service);
 
   void InitializeOnNetworkThread();
 
   // net::URLRequestContextGetter implementation.
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
       GetNetworkTaskRunner() const OVERRIDE;
 
-  DataReductionProxyConfigService* proxy_config_service();
+  data_reduction_proxy::DataReductionProxyAuthRequestHandler*
+      GetDataReductionProxyAuthRequestHandler() const;
 
  private:
   friend class AwBrowserContext;
   virtual ~AwURLRequestContextGetter();
 
   // Prior to GetURLRequestContext() being called, this is called to hand over
   // the objects that GetURLRequestContext() will later install into
   // |job_factory_|.  This ordering is enforced by having
   // AwBrowserContext::CreateRequestContext() call this method.
   // This method is necessary because the passed in objects are created
   // on the UI thread while |job_factory_| must be created on the IO thread.
   void SetHandlersAndInterceptors(
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors);
 
   void InitializeURLRequestContext();
 
   const base::FilePath partition_path_;
   scoped_refptr<net::CookieStore> cookie_store_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
-  scoped_ptr<DataReductionProxyConfigService> proxy_config_service_;
+  scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService>
+      data_reduction_proxy_config_service_;
+  scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler>
+      data_reduction_proxy_auth_request_handler_;
   scoped_ptr<net::URLRequestJobFactory> job_factory_;
   scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
   scoped_ptr<net::ChannelIDService> channel_id_service_;
 
   // ProtocolHandlers and interceptors are stored here between
   // SetHandlersAndInterceptors() and the first GetURLRequestContext() call.
   content::ProtocolHandlerMap protocol_handlers_;
   content::URLRequestInterceptorScopedVector request_interceptors_;
 
   DISALLOW_COPY_AND_ASSIGN(AwURLRequestContextGetter);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_URL_REQUEST_CONTEXT_GETTER_H_