[Cronet] change InitializeOnNetworkThread to use URLRequestContextBuilder

components/cronet/ios/cronet_environment.h

 // Copyright 2016 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_IOS_CRONET_ENVIRONMENT_H_
 #define COMPONENTS_CRONET_IOS_CRONET_ENVIRONMENT_H_
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "components/cronet/url_request_context_config.h"
 #include "net/cert/cert_verifier.h"
 #include "net/url_request/url_request.h"

[mmenke, 2016/11/23 18:41:33]

Not used

[lilyhoughton, 2016/11/28 16:42:21]

Done.

 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 class JsonPrefStore;
 
 namespace base {
 class WaitableEvent;
 }  // namespace base
 
 namespace net {
 class HttpCache;

[mmenke, 2016/11/23 18:41:33]

Not used.

[lilyhoughton, 2016/11/28 16:42:21]

Done.

 class NetworkChangeNotifier;
 class NetLog;
 class ProxyConfigService;

[mmenke, 2016/11/23 18:41:33]

Not used

[lilyhoughton, 2016/11/28 16:42:21]

Done.

 class WriteToFileNetLogObserver;
 }  // namespace net
 
 namespace cronet {
 // CronetEnvironment contains all the network stack configuration
 // and initialization.
 class CronetEnvironment {
  public:
   // Initialize Cronet environment globals. Must be called only once on the
   // main thread.
@@ skipping 29 matching lines @@
   void set_http2_enabled(bool enabled) { http2_enabled_ = enabled; }
   void set_quic_enabled(bool enabled) { quic_enabled_ = enabled; }
 
   bool http2_enabled() const { return http2_enabled_; }
   bool quic_enabled() const { return quic_enabled_; }
 
   void set_accept_language(const std::string& accept_language) {
     accept_language_ = accept_language;
   }
 
-  void set_cert_verifier(std::unique_ptr<net::CertVerifier> cert_verifier) {
-    cert_verifier_ = std::move(cert_verifier);
+  void set_mock_cert_verifier(
+      std::unique_ptr<net::CertVerifier> mock_cert_verifier) {
+    mock_cert_verifier_ = std::move(mock_cert_verifier);
   }
 
   void set_host_resolver_rules(const std::string& host_resolver_rules) {
     host_resolver_rules_ = host_resolver_rules;
   }
 
   void set_ssl_key_log_file_name(const std::string& ssl_key_log_file_name) {
     ssl_key_log_file_name_ = ssl_key_log_file_name;
   }
 
@@ skipping 31 matching lines @@
   std::string host_resolver_rules_;
   std::string ssl_key_log_file_name_;
 
   std::list<net::HostPortPair> quic_hints_;
 
   std::unique_ptr<base::Thread> network_io_thread_;
   std::unique_ptr<base::Thread> network_cache_thread_;
   std::unique_ptr<base::Thread> file_thread_;
   std::unique_ptr<base::Thread> file_user_blocking_thread_;
   scoped_refptr<base::SequencedTaskRunner> pref_store_worker_pool_;
   scoped_refptr<JsonPrefStore> net_pref_store_;

[mmenke, 2016/11/23 18:41:33]

Not used (And wasn't used before this CL, either)

[lilyhoughton, 2016/11/28 16:42:21]

Done.

-  std::unique_ptr<net::CertVerifier> cert_verifier_;
+  std::unique_ptr<net::CertVerifier> mock_cert_verifier_;
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;

[mmenke, 2016/11/23 18:41:33]

No longer used.

[lilyhoughton, 2016/11/28 16:42:21]

Done.

   std::unique_ptr<net::HttpServerProperties> http_server_properties_;

[mmenke, 2016/11/23 18:41:33]

No longer used.

[lilyhoughton, 2016/11/28 16:42:21]

Done.

   std::unique_ptr<net::URLRequestContext> main_context_;
   scoped_refptr<net::URLRequestContextGetter> main_context_getter_;
   std::string user_agent_;
   bool user_agent_partial_;
   std::unique_ptr<net::NetLog> net_log_;
   std::unique_ptr<net::WriteToFileNetLogObserver> net_log_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CronetEnvironment);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_IOS_CRONET_ENVIRONMENT_H_