Provide mutable members of UrlRequestContext via pure-virtual interface

net/url_request/url_request_context_builder.cc

 // Copyright (c) 2012 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.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_delegate.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/transport_security_state.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_service.h"
+#include "net/url_request/const_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 
 namespace net {
 
 namespace {
 
 class BasicNetworkDelegate : public NetworkDelegate {
  public:
   BasicNetworkDelegate() {}
@@ skipping 86 matching lines @@
       : cache_thread_("Cache Thread"),
         file_thread_("File Thread"),
         ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {}
 
   URLRequestContextStorage* storage() {
     return &storage_;
   }
 
   void set_user_agent(const std::string& user_agent) {
     user_agent_ = user_agent;
   }

[mmenke, 2012/10/05 20:08:51]

Remove this.

 
   void StartCacheThread() {
     cache_thread_.StartWithOptions(
         base::Thread::Options(MessageLoop::TYPE_IO, 0));
   }
 
   scoped_refptr<base::MessageLoopProxy> cache_message_loop_proxy() {
     DCHECK(cache_thread_.IsRunning());
     return cache_thread_.message_loop_proxy();
   }
 
   void StartFileThread() {
     file_thread_.StartWithOptions(
         base::Thread::Options(MessageLoop::TYPE_DEFAULT, 0));
   }
 
   MessageLoop* file_message_loop() {
     DCHECK(file_thread_.IsRunning());
     return file_thread_.message_loop();
   }
 
-  virtual const std::string& GetUserAgent(
-      const GURL& /* url */) const OVERRIDE {
-    return user_agent_;
-  }
-
  protected:
   virtual ~BasicURLRequestContext() {}
 
  private:
   std::string user_agent_;

[mmenke, 2012/10/05 20:08:51]

Remove this.

   base::Thread cache_thread_;
   base::Thread file_thread_;
   URLRequestContextStorage storage_;
   DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext);
 };
 
 }  // namespace
 
 URLRequestContextBuilder::HostResolverParams::HostResolverParams()
     : parallelism(HostResolver::kDefaultParallelism),
@@ skipping 25 matching lines @@
 void URLRequestContextBuilder::set_proxy_config_service(
     ProxyConfigService* proxy_config_service) {
   proxy_config_service_.reset(proxy_config_service);
 }
 #endif  // defined(OS_LINUX)
 
 URLRequestContext* URLRequestContextBuilder::Build() {
   BasicURLRequestContext* context = new BasicURLRequestContext;
   URLRequestContextStorage* storage = context->storage();
 
-  context->set_user_agent(user_agent_);
+  storage->set_http_user_agent_settings(new ConstHttpUserAgentSettings(
+      EmptyString(), EmptyString(), user_agent_));
 
   BasicNetworkDelegate* network_delegate = new BasicNetworkDelegate;
   storage->set_network_delegate(network_delegate);
 
   net::HostResolver* host_resolver = net::CreateSystemHostResolver(
       host_resolver_params_.parallelism,
       host_resolver_params_.retry_attempts,
       NULL /* no NetLog */);
   storage->set_host_resolver(host_resolver);
 
@@ skipping 80 matching lines @@
     http_transaction_factory = new HttpNetworkLayer(network_session);
   }
   storage->set_http_transaction_factory(http_transaction_factory);
 
   // TODO(willchan): Support sdch.
 
   return context;
 }
 
 }  // namespace net