Provide mutable members of UrlRequestContext via pure-virtual interface

net/url_request/url_request_test_util.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_test_util.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/default_server_bound_cert_store.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_impl.h"
+#include "net/url_request/const_http_user_agent_settings.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // These constants put the net::NetworkDelegate events of TestNetworkDelegate
 // into an order. They are used in conjunction with
 // |TestNetworkDelegate::next_states_| to check that we do not send
 // events in the wrong order.
 const int kStageBeforeURLRequest = 1 << 0;
@@ skipping 72 matching lines @@
   // In-memory cookie store.
   if (!cookie_store())
     context_storage_.set_cookie_store(new net::CookieMonster(NULL, NULL));
   // In-memory origin bound cert service.
   if (!server_bound_cert_service()) {
     context_storage_.set_server_bound_cert_service(
         new net::ServerBoundCertService(
             new net::DefaultServerBoundCertStore(NULL),
             base::WorkerPool::GetTaskRunner(true)));
   }
-  if (accept_language().empty())
-    set_accept_language("en-us,fr");
-  if (accept_charset().empty())
-    set_accept_charset("iso-8859-1,*,utf-8");
+  if (GetAcceptLanguage().empty()) {
+    context_storage_.set_http_user_agent_settings(
+        new net::ConstHttpUserAgentSettings(
+            "en-us,fr", GetAcceptCharset(), EmptyString()));
+  }
+  if (GetAcceptCharset().empty()) {
+    context_storage_.set_http_user_agent_settings(
+        new net::ConstHttpUserAgentSettings(
+            GetAcceptLanguage(), "iso-8859-1,*,utf-8", EmptyString()));
+  }

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

This isn't quite equivalent to the old code, since these both always clear the
user agent.

Given how the new code works, I think it would make the most sense just to check
if context_storage_.http_user_agent_settings is NULL.  This would require
mucking with url_request_unittest.cc a bit, but that seems to be the only test
that cares.

   if (!job_factory())
     context_storage_.set_job_factory(new net::URLRequestJobFactoryImpl);
 }
 
 TestURLRequest::TestURLRequest(const GURL& url,
                                Delegate* delegate,
                                TestURLRequestContext* context)
     : net::URLRequest(url, delegate, context) {
 }
 
@@ skipping 396 matching lines @@
 
 ScopedCustomUrlRequestTestHttpHost::~ScopedCustomUrlRequestTestHttpHost() {
   DCHECK_EQ(value_, new_value_);
   value_ = old_value_;
 }
 
 // static
 const std::string& ScopedCustomUrlRequestTestHttpHost::value() {
   return value_;
 }