[Cronet] Set up HttpServerPropertiesManager

components/cronet/android/cronet_url_request_context_adapter.h

Index: components/cronet/android/cronet_url_request_context_adapter.h
diff --git a/components/cronet/android/cronet_url_request_context_adapter.h b/components/cronet/android/cronet_url_request_context_adapter.h
index 5b6cccda8945da28cb11305a6c2b0d3d51950290..a42ac3a9e6dfff49b144e368395dff0c06528810 100644
--- a/components/cronet/android/cronet_url_request_context_adapter.h
+++ b/components/cronet/android/cronet_url_request_context_adapter.h
@@ -18,15 +18,18 @@
 #include "base/prefs/json_pref_store.h"
 #include "base/threading/thread.h"
 
+class PrefService;
+
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace net {
-class WriteToFileNetLogObserver;
-class URLRequestContext;
+class HttpServerPropertiesManager;
 class ProxyConfigService;
 class SdchOwner;
+class URLRequestContext;
+class WriteToFileNetLogObserver;
 }  // namespace net
 
 namespace cronet {
@@ -104,13 +107,20 @@ class CronetURLRequestContextAdapter {
   // |write_to_file_observer_| and |context_| should only be accessed on
   // network thread.
   scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;
+

[pauljensen, 2015/07/06 16:31:46]

Can we remove this new line? and the one on line 114, 116, 118, 120, 131, 133? 
Our generally policy is to minimize use of vertical whitespace:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Vertical_Whit...

[xunjieli, 2015/07/06 19:40:03]

Partially done. I still left a new line before variable with comments. Tried
removing those, but it looks too crowded.

+  // |pref_service_| should outlive the HttpServerPropertiesManager owned by
+  // |context_|.
+  scoped_ptr<PrefService> pref_service_;
+
   scoped_ptr<net::URLRequestContext> context_;
+
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
 
+  scoped_refptr<JsonPrefStore> json_pref_store_;

[pauljensen, 2015/07/06 16:31:46]

why is this line moved up?

[xunjieli, 2015/07/06 19:40:03]

Before this CL, only sdch_owner uses json_pref_store, so I put them together.
With this change, HttpServerPropertiesManager is also using json_pref_store. I
moved json_pref_store above the comment so json_pref_store does not appear
exclusively associated with sdch_owner.

+
   // |sdch_owner_| should be destroyed before |json_pref_store_|, because
   // tearing down |sdch_owner_| forces |json_pref_store_| to flush pending
   // writes to the disk.
-  scoped_refptr<JsonPrefStore> json_pref_store_;
   scoped_ptr<net::SdchOwner> sdch_owner_;
 
   // Context config is only valid untng context is initialized.

[pauljensen, 2015/07/06 16:31:46]

untng->until

[xunjieli, 2015/07/06 19:40:03]

Done.

@@ -118,7 +128,9 @@ class CronetURLRequestContextAdapter {
 
   // A queue of tasks that need to be run after context has been initialized.
   std::queue<base::Closure> tasks_waiting_for_context_;
+
   bool is_context_initialized_;
+
   int default_load_flags_;
 
 #if defined(DATA_REDUCTION_PROXY_SUPPORT)