chrome/browser/background/background_contents_service_unittest.cc - Issue 15517005: Remove references to Profile from browser_context_keyed_service.

Unified Diff: chrome/browser/background/background_contents_service_unittest.cc

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase & style Created 7 years, 7 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 | « chrome/browser/background/background_contents_service_factory.cc ('k') | chrome/browser/bookmarks/bookmark_model.h » ('j') | tools/valgrind/memcheck/suppressions.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/background/background_contents_service_unittest.cc

diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc

index 6964c11e4c6cf4767a0ead48db0d5883ad4b82ac..f05216c51b1e0394749ab608555b0a4ab8f08857 100644

--- a/chrome/browser/background/background_contents_service_unittest.cc

+++ b/chrome/browser/background/background_contents_service_unittest.cc

@@ -124,8 +124,8 @@ TEST_F(BackgroundContentsServiceTest, BackgroundContentsCreateDestroy) {

TEST_F(BackgroundContentsServiceTest, BackgroundContentsUrlAdded) {

TestingProfile profile;

BackgroundContentsService service(&profile, command_line_.get());

- BackgroundContentsServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

- &profile);

+ BackgroundContentsServiceFactory::GetInstance()->

+ RegisterUserPrefsOnBrowserContext(&profile);

GURL orig_url;

GURL url("http://a/");

GURL url2("http://a/");

@@ -151,8 +151,8 @@ TEST_F(BackgroundContentsServiceTest, BackgroundContentsUrlAdded) {

TEST_F(BackgroundContentsServiceTest, BackgroundContentsUrlAddedAndClosed) {

TestingProfile profile;

BackgroundContentsService service(&profile, command_line_.get());

- BackgroundContentsServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

- &profile);

+ BackgroundContentsServiceFactory::GetInstance()->

+ RegisterUserPrefsOnBrowserContext(&profile);

GURL url("http://a/");

MockBackgroundContents* contents = new MockBackgroundContents(&profile);

@@ -172,8 +172,8 @@ TEST_F(BackgroundContentsServiceTest, BackgroundContentsUrlAddedAndClosed) {

TEST_F(BackgroundContentsServiceTest, RestartBackgroundContents) {

TestingProfile profile;

BackgroundContentsService service(&profile, command_line_.get());

- BackgroundContentsServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

- &profile);

+ BackgroundContentsServiceFactory::GetInstance()->

+ RegisterUserPrefsOnBrowserContext(&profile);

GURL url("http://a/");

{

@@ -204,8 +204,8 @@ TEST_F(BackgroundContentsServiceTest, RestartBackgroundContents) {

TEST_F(BackgroundContentsServiceTest, TestApplicationIDLinkage) {

TestingProfile profile;

BackgroundContentsService service(&profile, command_line_.get());

- BackgroundContentsServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(

- &profile);

+ BackgroundContentsServiceFactory::GetInstance()->

+ RegisterUserPrefsOnBrowserContext(&profile);

EXPECT_EQ(NULL, service.GetAppBackgroundContents(ASCIIToUTF16("appid")));

MockBackgroundContents* contents = new MockBackgroundContents(&profile,