trunk/src/chrome/browser/extensions/extension_service_unittest.cc - Issue 23551005: Revert 219709 "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: trunk/src/chrome/browser/extensions/extension_service_unittest.cc

Issue 23551005: Revert 219709 "Remove the Extensions URLRequestContext." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

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

Download patch

« no previous file with comments | « trunk/src/chrome/browser/extensions/extension_process_manager_unittest.cc ('k') | trunk/src/chrome/browser/extensions/extension_warning_badge_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/extensions/extension_service_unittest.cc

===================================================================

--- trunk/src/chrome/browser/extensions/extension_service_unittest.cc (revision 219785)

+++ trunk/src/chrome/browser/extensions/extension_service_unittest.cc (working copy)

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

#include "base/memory/weak_ptr.h"

#include "base/message_loop/message_loop.h"

#include "base/path_service.h"

-#include "base/run_loop.h"

#include "base/stl_util.h"

#include "base/strings/string16.h"

#include "base/strings/string_number_conversions.h"

@@ -4110,8 +4109,8 @@

// Set a cookie for the extension.

net::CookieMonster* cookie_monster =

- BrowserContext::GetDefaultStoragePartition(profile_.get())->

- GetCookieStoreForScheme(ext_url.scheme())->GetCookieMonster();

+ profile_->GetRequestContextForExtensions()->GetURLRequestContext()->

+ cookie_store()->GetCookieMonster();

ASSERT_TRUE(cookie_monster);

net::CookieOptions options;

cookie_monster->SetCookieWithOptionsAsync(

@@ -4226,8 +4225,8 @@

// Set a cookie for the extension.

net::CookieMonster* cookie_monster =

- BrowserContext::GetDefaultStoragePartition(profile_.get())->

- GetCookieStoreForScheme(origin1.scheme())->GetCookieMonster();

+ profile_->GetRequestContext()->GetURLRequestContext()->

+ cookie_store()->GetCookieMonster();

ASSERT_TRUE(cookie_monster);

net::CookieOptions options;

cookie_monster->SetCookieWithOptionsAsync(

@@ -4923,8 +4922,8 @@

ExtensionErrorReporter::Init(false); // no noisy errors

ExtensionsReadyRecorder recorder;

- content::TestBrowserThreadBundle thread_bundle;

scoped_ptr<TestingProfile> profile(new TestingProfile());

+ content::TestBrowserThreadBundle thread_bundle_;

#if defined OS_CHROMEOS

chromeos::ScopedTestDeviceSettingsService device_settings_service;

chromeos::ScopedTestCrosSettings cros_settings;