Provide mutable members of UrlRequestContext via pure-virtual interface

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 5388b4978a5c66cfae615dbfb3b34c7fe30a8f9e..c6f3214e8bce7fd27c974b243c7eb174932aba38 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -16,6 +16,7 @@
 #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"
 
@@ -108,10 +109,16 @@ void TestURLRequestContext::Init() {
             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);
 }