Setup ProxyConfigServiceAndroid in Cronet

components/cronet/android/url_request_context_adapter.h

 // Copyright 2014 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 COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_
 
 #include <queue>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "net/base/net_log.h"
 #include "net/base/network_change_notifier.h"
+#include "net/proxy/proxy_config_service.h"

[mef, 2014/10/15 20:04:55]

I think you should be able to forward-declare net::ProxyConfigService.

[xunjieli, 2014/10/15 20:27:46]

Done.

 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace net {
 class NetLogLogger;
 }  // namespace net
 
 namespace cronet {
 
 struct URLRequestContextConfig;
@@ skipping 43 matching lines @@
   const std::string& GetUserAgent(const GURL& url) const;
 
   // net::URLRequestContextGetter implementation:
   virtual net::URLRequestContext* GetURLRequestContext() override;
   virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override;
 
   void StartNetLogToFile(const std::string& file_name);
   void StopNetLog();
 
+  // Called on main Java thread to initialize URLRequestContext.
+  void InitRequestContextOnMainThread();
+
  private:
   scoped_refptr<URLRequestContextAdapterDelegate> delegate_;
   scoped_ptr<net::URLRequestContext> context_;
   std::string user_agent_;
   base::Thread* network_thread_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<NetLogObserver> net_log_observer_;
   scoped_ptr<net::NetLogLogger> net_log_logger_;
+  scoped_ptr<net::ProxyConfigService> proxy_config_service_;
+  scoped_ptr<URLRequestContextConfig> config_;
 
   // A queue of tasks that need to be run after context has been initialized.
   std::queue<RunAfterContextInitTask> tasks_waiting_for_context_;
   bool is_context_initialized_;
 
   virtual ~URLRequestContextAdapter();
 
   // Initializes |context_| on the Network thread.
-  void InitializeURLRequestContext(scoped_ptr<URLRequestContextConfig> config);
+  void InitRequestContextOnNetworkThread();
 
   // Helper function to start writing NetLog data to file. This should only be
   // run after context is initialized.
   void StartNetLogToFileHelper(const std::string& file_name);
   // Helper function to stop writing NetLog data to file. This should only be
   // run after context is initialized.
   void StopNetLogHelper();
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContextAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_URL_REQUEST_CONTEXT_ADAPTER_H_