[Cronet] Hook up library loader, system proxy and network change notifier to async api.

components/cronet/android/cronet_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_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
 
 #include <string>
 
 #include "base/callback.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"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
 class NetLogLogger;
 class URLRequestContext;
+class ProxyConfigService;
 }  // namespace net
 
 namespace cronet {
 
 struct URLRequestContextConfig;
+typedef base::Callback<void(void)> RunAfterContextInitTask;

[mmenke, 2015/01/23 20:41:41]

Should just use base::Closure (Defined in callback.h)

[mef, 2015/01/28 21:32:28]

Done.

[xunjieli, 2015/01/29 16:38:59]

I might be wrong, but I think we should still keep the name
"RunAfterContextInitTask" since the queuing logic in the cc file is still there.
I think what Matt meant might be to change it to "typedef base::Closure
RunAfterContextInitTask". If this makes sense, could you change the typedef in
url_request_context_adapter.h as well?

 
 // Adapter between Java CronetUrlRequestContext and net::URLRequestContext.
 class CronetURLRequestContextAdapter {
  public:
-  CronetURLRequestContextAdapter();
+  explicit CronetURLRequestContextAdapter(
+      scoped_ptr<URLRequestContextConfig> context_config);
 
   ~CronetURLRequestContextAdapter();
 
-  void Initialize(scoped_ptr<URLRequestContextConfig> config,
-                  const base::Closure& java_init_network_thread);
+  // Called on main Java thread to initialize URLRequestContext.
+  void InitRequestContextOnMainThread(
+      const base::Closure& java_init_network_thread);
 
   // Releases all resources for the request context and deletes the object.
   // Blocks until network thread is destroyed after running all pending tasks.
   void Destroy();
 
+  // Posts a task that might depend on the context being initialized
+  // to the network thread.
+  void PostTaskToNetworkThread(const tracked_objects::Location& posted_from,
+                               const RunAfterContextInitTask& callback);

[mmenke, 2015/01/23 20:41:41]

With this change, GetNetworkTaskRunner() seems no longer safe to expose.  Let's
get rid of it, and make a method IsOnNetworkThread in its place.

[mef, 2015/01/28 21:32:28]

Done.

+
   net::URLRequestContext* GetURLRequestContext();
 
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const;
 
   void StartNetLogToFile(const std::string& file_name);
 
   void StopNetLog();
 
   // Default net::LOAD flags used to create requests.
   int default_load_flags() const { return default_load_flags_; }
 
+  // Called on main Java thread to initialize URLRequestContext.
+  void InitRequestContextOnMainThread();
+
  private:
   // Initializes |context_| on the Network thread.
   void InitializeOnNetworkThread(
       scoped_ptr<URLRequestContextConfig> config,
       const base::Closure& java_init_network_thread);
+
+  // Runs a task that might depend on the context being initialized.
+  // This method should only be run on the network thread.
+  void RunTaskAfterContextInitOnNetworkThread(
+      const RunAfterContextInitTask& callback);
+
   void StartNetLogToFileOnNetworkThread(const std::string& file_name);
+
   void StopNetLogOnNetworkThread();
 
   // Network thread is owned by |this|, but is destroyed from java thread.
   base::Thread* network_thread_;
   // |net_log_logger_| and |context_| should only be accessed on network thread.
   scoped_ptr<net::NetLogLogger> net_log_logger_;
   scoped_ptr<net::URLRequestContext> context_;
+  scoped_ptr<net::ProxyConfigService> proxy_config_service_;
+
+  // Context config is only valid untng context is initialized.
+  scoped_ptr<URLRequestContextConfig> context_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_;
   int default_load_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_