summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 15:08:43 +0000
committerpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 15:08:43 +0000
commitee4c30d8c5fca53a990da472de17314de366341b (patch)
treebc52b41397e143b46d0673991a13052edb1c9c66 /content/shell
parent91d4f2541624923604d54fdf280483a08a393464 (diff)
downloadchromium_src-ee4c30d8c5fca53a990da472de17314de366341b.zip
chromium_src-ee4c30d8c5fca53a990da472de17314de366341b.tar.gz
chromium_src-ee4c30d8c5fca53a990da472de17314de366341b.tar.bz2
Provide mutable members of UrlRequestContext via pure-virtual interface. Create a pure-virtual interface called HttpUserAgentSettings that provides access to the Accept-Language, Accept-Charset, and User-Agent HTTP headers. Each UrlRequestContext should have a HttpUserAgentSettings implementation attached via set_http_user_agent_settings().
BUG=146596 Review URL: https://chromiumcodereview.appspot.com/10918279 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_url_request_context_getter.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc
index 9300dc6..3c4cb12 100644
--- a/content/shell/shell_url_request_context_getter.cc
+++ b/content/shell/shell_url_request_context_getter.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
+#include "base/string_util.h"
#include "base/threading/worker_pool.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_switches.h"
@@ -24,6 +25,7 @@
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.h"
#include "net/proxy/proxy_service.h"
+#include "net/url_request/static_http_user_agent_settings.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_job_factory_impl.h"
@@ -68,8 +70,9 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
storage_->set_server_bound_cert_service(new net::ServerBoundCertService(
new net::DefaultServerBoundCertStore(NULL),
base::WorkerPool::GetTaskRunner(true)));
- url_request_context_->set_accept_language("en-us,en");
- url_request_context_->set_accept_charset("iso-8859-1,*,utf-8");
+ storage_->set_http_user_agent_settings(
+ new net::StaticHttpUserAgentSettings(
+ "en-us,en", "iso-8859-1,*,utf-8", EmptyString()));
scoped_ptr<net::HostResolver> host_resolver(
net::HostResolver::CreateDefaultResolver(NULL));