[cronet] Add member for QUIC user agent ID, with getter and setter.

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/strings/sys_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
+#include "components/cronet/ios/version.h"
 #include "components/cronet/url_request_context_config.h"
 #include "net/cert/cert_verifier.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace base {
 class WaitableEvent;
 }  // namespace base
 
 namespace net {
@@ skipping 32 matching lines @@
   // Stops logging and flushes file. If not currently logging this call is
   // ignored.
   void StopNetLog();
 
   void AddQuicHint(const std::string& host, int port, int alternate_port);
 
   // Setters and getters for |http2_enabled_|, |quic_enabled_|, and
   // |forced_quic_origin_|. These only have any effect before Start() is
   // called.
   void set_http2_enabled(bool enabled) { http2_enabled_ = enabled; }
-  void set_quic_enabled(bool enabled) { quic_enabled_ = enabled; }
+  // In addition to setting |quic_enabled_|, this sets |quic_user_agent_id_|
+  // to the default.  A non-default user agent must be set _after_ this
+  // function is called, or it will be overwritten.
+  void set_quic_enabled(bool enabled) {
+    quic_enabled_ = enabled;
+    quic_user_agent_id_ = getDefaultQuicUserAgentId();

[mef, 2016/12/12 21:52:20]

Maybe call getDefaultQuicUserAgentId() when it is needed if
|quic_user_agent_id_| is empty? This will avoid call order requirement and make
NSBundle call unnecessary if app sets it explicitly.

[lilyhoughton, 2016/12/13 15:10:22]

call to getDefaultQuicUserAgentId() removed per comment in
cronet_environment.mm.  |quic_user_agent_id_| is set to the default at
initialization time.

+  }
 
   bool http2_enabled() const { return http2_enabled_; }
   bool quic_enabled() const { return quic_enabled_; }
 
+  void set_quic_user_agent_id(std::string& quic_user_agent_id) {

[mef, 2016/12/12 21:52:20]

const std::string&

[lilyhoughton, 2016/12/13 15:10:22]

Done.

+    quic_user_agent_id_ = quic_user_agent_id;
+  }
+
   void set_accept_language(const std::string& accept_language) {
     accept_language_ = accept_language;
   }
 
   void set_mock_cert_verifier(
       std::unique_ptr<net::CertVerifier> mock_cert_verifier) {
     mock_cert_verifier_ = std::move(mock_cert_verifier);
   }
 
   void SetHostResolverRules(const std::string& host_resolver_rules);
@@ skipping 27 matching lines @@
 
   // 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);
 
+  std::string getDefaultQuicUserAgentId() {

[mef, 2016/12/12 21:52:20]

non-trivial set/get methods should have non-inline implementation (in .mm as
opposed to .h file). 

[lilyhoughton, 2016/12/13 15:10:22]

Done.

+    return base::SysNSStringToUTF8([[NSBundle mainBundle]
+               objectForInfoDictionaryKey:@"CFBundleDisplayName"]) +
+           " Cronet/" + CRONET_VERSION;
+  }
+
   bool http2_enabled_;
   bool quic_enabled_;
+  std::string quic_user_agent_id_;
   std::string accept_language_;
   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_;
   std::unique_ptr<net::CertVerifier> mock_cert_verifier_;
   std::unique_ptr<net::CookieStore> cookie_store_;
   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_