[Cronet] Set up HttpServerPropertiesManager

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 <jni.h>
 
 #include <queue>
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #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 {
 
 #if defined(DATA_REDUCTION_PROXY_SUPPORT)
 class CronetDataReductionProxy;
 #endif
 
 struct URLRequestContextConfig;
 
@@ skipping 57 matching lines @@
 
   // Network thread is owned by |this|, but is destroyed from java thread.
   base::Thread* network_thread_;
 
   // File thread should be destroyed last.
   scoped_ptr<base::Thread> file_thread_;
 
   // |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.

   scoped_ptr<URLRequestContextConfig> context_config_;
 
   // 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)
   scoped_ptr<CronetDataReductionProxy> data_reduction_proxy_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_