chrome/browser/sync/test/integration/sync_test.cc - Issue 839193002: Move ServiceAccessType into //components/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/sync_test.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on android Created 5 years, 11 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/passwords_helper.cc ('k') | chrome/browser/sync/test/integration/typed_urls_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4ebe2361c86eb427289a4467b761c6f3622f72d3..7f345faf82423e70809380e219f0ec26a6a282e8 100644

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

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

@@ -397,7 +397,7 @@ bool SyncTest::SetupClients() {

bookmarks::test::WaitForBookmarkModelToLoad(

BookmarkModelFactory::GetForProfile(verifier()));

ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile(

- verifier(), Profile::EXPLICIT_ACCESS));

+ verifier(), ServiceAccessType::EXPLICIT_ACCESS));

ui_test_utils::WaitForTemplateURLServiceToLoad(

TemplateURLServiceFactory::GetForProfile(verifier()));

return (verifier_ != NULL);

@@ -457,7 +457,7 @@ void SyncTest::InitializeInstance(int index) {

bookmarks::test::WaitForBookmarkModelToLoad(

BookmarkModelFactory::GetForProfile(GetProfile(index)));

ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile(

- GetProfile(index), Profile::EXPLICIT_ACCESS));

+ GetProfile(index), ServiceAccessType::EXPLICIT_ACCESS));

ui_test_utils::WaitForTemplateURLServiceToLoad(

TemplateURLServiceFactory::GetForProfile(GetProfile(index)));

}