Third try at landing gRPC refactoring. Previous issue failed on the waterfall

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>
@@ skipping 26 matching lines @@
 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.
   static void Initialize();
 
   // |user_agent| will be used to generate the user-agent if
-  // |user_agent_partial|
-  // is true, or will be used as complete user-agent otherwise.
+  // |user_agent_partial| is true, or will be used as the complete user-agent
+  // otherwise.
   CronetEnvironment(const std::string& user_agent, bool user_agent_partial);
   ~CronetEnvironment();
 
   // Starts this instance of Cronet environment.
   void Start();
 
   // The full user-agent.
   std::string user_agent();
 
   // Get global UMA histogram deltas.
@@ skipping 18 matching lines @@
   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_host_resolver_rules(const std::string& host_resolver_rules) {
-    host_resolver_rules_ = host_resolver_rules;
-  }
+  void SetHostResolverRules(const std::string& 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;
   }
 
+  // Returns the URLRequestContext associated with this object.
   net::URLRequestContext* GetURLRequestContext() const;
 
+  // Return the URLRequestContextGetter associated with this object.
   net::URLRequestContextGetter* GetURLRequestContextGetter() const;
 
-  bool IsOnNetworkThread();
+ private:
+  // Performs initialization tasks that must happen on the network thread.
+  void InitializeOnNetworkThread();
 
   // Runs a closure on the network thread.
   void PostToNetworkThread(const tracked_objects::Location& from_here,
                            const base::Closure& task);
 
- private:
-  // Performs initialization tasks that must happen on the network thread.
-  void InitializeOnNetworkThread();
-
   // Runs a closure on the file user blocking thread.
   void PostToFileUserBlockingThread(const tracked_objects::Location& from_here,
                                     const base::Closure& task);
 
   // Helper methods that start/stop net logging on the network thread.
   void StartNetLogOnNetworkThread(const base::FilePath::StringType& file_name,
                                   bool log_bytes);
   void StopNetLogOnNetworkThread(base::WaitableEvent* log_stopped_event);
 
   // Returns the HttpNetworkSession object from the passed in
   // URLRequestContext or NULL if none exists.
   net::HttpNetworkSession* GetHttpNetworkSession(
       net::URLRequestContext* context);
 
+  // Sets host resolver rules on the network_io_thread_.
+  void SetHostResolverRulesOnNetworkThread(const std::string& rules,
+                                           base::WaitableEvent* event);
+
   bool http2_enabled_;
   bool quic_enabled_;
   std::string accept_language_;
-  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_;
   std::unique_ptr<net::CertVerifier> cert_verifier_;
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
   std::unique_ptr<net::HttpServerProperties> http_server_properties_;
   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_