chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc - Issue 15517005: Remove references to Profile from browser_context_keyed_service.

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: chrome/browser/sync/test/integration/two_client_search_engines_sync_test.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/sync/test/integration/search_engines_helper.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | tools/valgrind/memcheck/suppressions.txt » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc

index 9251fccad6b8da880469eaa8f22a08ad893bfd79..4165d5113741a80e87230a2ef1b74917bf737532 100644

--- a/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc

@@ -145,7 +145,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientSearchEnginesSyncTest, ConflictKeyword) {

// conflict.

search_engines_helper::AddSearchEngine(0, 0);

search_engines_helper::AddSearchEngine(1, 1);

- TemplateURLService* service = search_engines_helper::GetServiceForProfile(1);

+ TemplateURLService* service =

+ search_engines_helper::GetServiceForBrowserContext(1);

TemplateURL* turl = service->GetTemplateURLForKeyword(ASCIIToUTF16("test1"));

EXPECT_TRUE(turl);

service->ResetTemplateURL(turl, turl->short_name(), ASCIIToUTF16("test0"),