Provide mutable members of UrlRequestContext via pure-virtual interface

chrome/browser/profiles/profile_io_data.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 "chrome/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_resource_protocols.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
+#include "chrome/browser/net/chrome_http_user_agent_settings.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/http_server_properties_manager.h"
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
 #include "chrome/browser/net/transport_security_persister.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/policy/url_blacklist_manager.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
@@ skipping 93 matching lines @@
 
 }  // namespace
 
 void ProfileIOData::InitializeOnUIThread(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* pref_service = profile->GetPrefs();
 
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->path = profile->GetPath();
 
-  // Set up Accept-Language and Accept-Charset header values
-  params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader(
-      pref_service->GetString(prefs::kAcceptLanguages));
-  std::string default_charset = pref_service->GetString(prefs::kDefaultCharset);
-  params->accept_charset =
-      net::HttpUtil::GenerateAcceptCharsetHeader(default_charset);
+  params->chrome_http_user_agent_settings.reset(
+      new ChromeHttpUserAgentSettings(pref_service));
 
   params->io_thread = g_browser_process->io_thread();
 
   params->cookie_settings = CookieSettings::Factory::GetForProfile(profile);
   params->ssl_config_service = profile->GetSSLConfigService();
   base::Callback<Profile*(void)> profile_getter =
       base::Bind(&GetProfileOnUI, g_browser_process->profile_manager(),
                  profile);
   params->cookie_monster_delegate =
       new ChromeCookieMonsterDelegate(profile_getter);
@@ skipping 399 matching lines @@
   extension_info_map_ = profile_params_->extension_info_map;
 
   resource_context_->host_resolver_ = io_thread_globals->host_resolver.get();
   resource_context_->request_context_ = main_request_context_.get();
 
   if (profile_params_->resource_prefetch_predictor_observer_.get()) {
     resource_prefetch_predictor_observer_.reset(
         profile_params_->resource_prefetch_predictor_observer_.release());
   }
 
+  chrome_http_user_agent_settings_.reset(
+      profile_params_->chrome_http_user_agent_settings.release());
+
   LazyInitializeInternal(profile_params_.get());
 
   profile_params_.reset();
   initialized_ = true;
 }
 
 void ProfileIOData::ApplyProfileParamsToContext(
     ChromeURLRequestContext* context) const {
   context->set_is_incognito(is_incognito());
-  context->set_accept_language(profile_params_->accept_language);
-  context->set_accept_charset(profile_params_->accept_charset);
+  context->set_http_user_agent_settings(
+    chrome_http_user_agent_settings_.get());

[mmenke, 2012/10/25 18:06:33]

nit:  4 space indent.  Actually, can this all fit on one line?

   context->set_ssl_config_service(profile_params_->ssl_config_service);
 }
 
 void ProfileIOData::SetUpJobFactoryDefaults(
     net::URLRequestJobFactory* job_factory,
     scoped_ptr<net::URLRequestJobFactory::Interceptor>
         protocol_handler_interceptor,
     net::NetworkDelegate* network_delegate,
     net::FtpTransactionFactory* ftp_transaction_factory,
     net::FtpAuthCache* ftp_auth_cache) const {
@@ skipping 63 matching lines @@
 #if !defined(OS_CHROMEOS)
   enable_metrics_.Destroy();
 #endif
   safe_browsing_enabled_.Destroy();
   printing_enabled_.Destroy();
   session_startup_pref_.Destroy();
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_.get())
     url_blacklist_manager_->ShutdownOnUIThread();
 #endif
+  if (chrome_http_user_agent_settings_.get())
+    chrome_http_user_agent_settings_->CleanupOnUIThread();

[mmenke, 2012/10/25 18:06:33]

Doesn't this always need to be called?  Otherwise, it will access prefs_ on the
IO thread when it's deleted there.

Also, I don't believe this is threadsafe for another reason. 
chrome_http_user_agent_settings_ is initialized on the IO thread, and here we're
accessin it on the UI thread.  Is there any guarantee we don't have a
LazyInitialize() in progress when we reach this point?

Think you can just set chrome_http_user_agent_settings_ on construction.

[pauljensen, 2012/10/25 21:30:25]

I don't think we can construct ChromeHttpUserAgentSettings in ProfileIOData()
because the PrefService isn't constructed yet.  There are several alternatives:
1. We could construct ChromeHttpUserAgentSettings in ProfileIOData() and add
ChromeHttpUserAgentSettings::InitAfterPrefsLoaded() that we could call later.
2. We could construct ChromeHttpUserAgentSettings in
ProfileIODataImpl::Handle::Init() which is called from 
ProfileImpl::OnPrefsLoaded() but there isn't a corresponding 
OffTheRecordProfileImpl::Handle::Init().
3. We could construct ChromeHttpUserAgentSettings and set
chrome_http_user_agent_settings_ directly in
ProfileIOData::InitializeOnUIThread() instead of passing through the
profile_params_.  This way it can be initialized next to the other PrefMember
members of ProfileIOData.  This should avoid the threading issues.
4. We could yank the StringPrefMember's out of ChromeHttpUserAgentSettings and
put them in ProfileIOData, similar to enable_referrers_, and pass their
addresses into ChromeHttpUserAgentSettings().
I've implemented #3 because it seems to be the simplest and most
straightforward.

[mmenke, 2012/10/26 18:42:09]

Sounds like the best approach to me, too.

   bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
   if (!posted)
     delete this;
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
@@ skipping 26 matching lines @@
   params->http_pipelining_enabled = globals->http_pipelining_enabled;
   params->testing_fixed_http_port = globals->testing_fixed_http_port;
   params->testing_fixed_https_port = globals->testing_fixed_https_port;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) {
     params->trusted_spdy_proxy = command_line.GetSwitchValueASCII(
         switches::kTrustedSpdyProxy);
   }
 }