content/shell/shell_url_request_context_getter.cc - Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/shell_url_request_context_getter.cc

Issue 10918279: Provide mutable members of UrlRequestContext via pure-virtual interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address erikwright's second round of comments. Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/service/net/service_url_request_context.cc ('K') | « chrome/service/net/service_url_request_context.cc ('k') | net/net.gyp » ('j') | net/url_request/const_http_accept_language_and_charset.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/shell_url_request_context_getter.cc

diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc

index b8a6f03f483daa35956892dd848d5864a307839c..911622314e05bd46050f1e84da4ff9b25267dc48 100644

--- a/content/shell/shell_url_request_context_getter.cc

+++ b/content/shell/shell_url_request_context_getter.cc

@@ -7,6 +7,7 @@

#include "base/command_line.h"

#include "base/logging.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/shell/shell_network_delegate.h"

@@ -63,8 +64,8 @@ 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::ConstHttpUserAgentSettings(

+ "en-us,en", "iso-8859-1,*,utf-8", EmptyString()));

storage_->set_host_resolver(

net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,