Provide mutable members of UrlRequestContext via pure-virtual interface

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 8fbe53c50f350c89417c48c22d8331c25ecd0016..9b51826dd5e52a775a8fd33d8ad8a298a1d60722 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -84,6 +84,13 @@ void AwURLRequestContextGetter::Init() {
   builder.set_network_delegate(new AwNetworkDelegate());
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
   builder.set_proxy_config_service(proxy_config_service_.release());
+  builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
+      content::GetContentClient()->browser()->GetAcceptLangs(
+          browser_context_)));
+
+  // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb
+  builder.set_accept_charset(
+      net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1"));
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
   cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
@@ -94,15 +101,6 @@ void AwURLRequestContextGetter::Init() {
 
   url_request_context_.reset(builder.Build());
 
-  url_request_context_->set_accept_language(
-      net::HttpUtil::GenerateAcceptLanguageHeader(
-          content::GetContentClient()->browser()->GetAcceptLangs(
-              browser_context_)));
-
-  // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb
-  url_request_context_->set_accept_charset(
-      net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1"));
-
   job_factory_.reset(new AwURLRequestJobFactory);
   bool set_protocol = job_factory_->SetProtocolHandler(
       chrome::kFileScheme, new net::FileProtocolHandler());