content/shell/browser/shell_url_request_context_getter.cc - Issue 12546016: Remove the Extensions URLRequestContext

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/browser/shell_url_request_context_getter.cc

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android webview init fix merged in. Created 7 years, 4 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:

Index: content/shell/browser/shell_url_request_context_getter.cc

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

index dfdb85275d7b501dd0f3d834ba2a1624ff3b3e47..6ddfa14abed4694941c1d5fa220a9266992b6101 100644

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

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

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

#include "base/threading/sequenced_worker_pool.h"

#include "base/threading/worker_pool.h"

#include "content/public/browser/browser_thread.h"

+#include "content/public/browser/cookie_store_factory.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/url_constants.h"

#include "content/shell/browser/shell_network_delegate.h"

@@ -101,7 +102,8 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {

url_request_context_->set_network_delegate(network_delegate_.get());

storage_.reset(

new net::URLRequestContextStorage(url_request_context_.get()));

- storage_->set_cookie_store(new net::CookieMonster(NULL, NULL));

+ storage_->set_cookie_store(

+ content::CreateCookieStore(content::CookieStoreConfig()));

storage_->set_server_bound_cert_service(new net::ServerBoundCertService(

new net::DefaultServerBoundCertStore(NULL),

base::WorkerPool::GetTaskRunner(true)));