Provide mutable members of UrlRequestContext via pure-virtual interface

chrome/browser/policy/device_management_service.cc

Index: chrome/browser/policy/device_management_service.cc
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc
index c985447bd60289fc57d35ae58f91a6309c8e4b04..be4319bc43de490508d82664bdee944532309e20 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -13,6 +13,7 @@
 #include "base/stringprintf.h"
 #include "base/sys_info.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/net/basic_http_user_agent_settings.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_thread.h"
@@ -183,10 +184,8 @@ class DeviceManagementRequestContext : public net::URLRequestContext {
  public:
   explicit DeviceManagementRequestContext(net::URLRequestContext* base_context);
   virtual ~DeviceManagementRequestContext();
-
  private:
-  // Overridden from net::URLRequestContext:
-  virtual const std::string& GetUserAgent(const GURL& url) const OVERRIDE;
+  scoped_ptr<BasicHttpUserAgentSettings> basic_http_user_agent_settings_;
 };
 
 DeviceManagementRequestContext::DeviceManagementRequestContext(
@@ -207,20 +206,17 @@ DeviceManagementRequestContext::DeviceManagementRequestContext(
   // No cookies, please.
   set_cookie_store(new net::CookieMonster(NULL, NULL));
 
-  // Initialize these to sane values for our purposes.
-  set_accept_language("*");
-  set_accept_charset("*");
+  // Initialize Accept-Language and Accept-Charset to sane values for our
+  // purposes.
+  basic_http_user_agent_settings_.reset(
+      new BasicHttpUserAgentSettings("*", "*"));
+  set_http_user_agent_settings(basic_http_user_agent_settings_.get());
 }
 
 DeviceManagementRequestContext::~DeviceManagementRequestContext() {
   delete http_transaction_factory();
 }
 
-const std::string& DeviceManagementRequestContext::GetUserAgent(
-    const GURL& url) const {
-  return content::GetUserAgent(url);
-}
-
 // Request context holder.
 class DeviceManagementRequestContextGetter
     : public net::URLRequestContextGetter {