chrome/browser/sync/test/integration/bookmarks_helper.cc - Issue 2354613002: [Sync] Fix namespaces for the browser_sync component.

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/bookmarks_helper.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)

Patch Set: Address comments. Created 4 years, 3 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/sync_ui_util_unittest.cc ('k') | chrome/browser/sync/test/integration/multi_client_status_change_checker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 0fbe94ccdf185d6bf9f451ca11df9365bb1893e9..bc0ba98193ce1532a1eb53ff63862cf83389afd2 100644

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

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

@@ -267,7 +267,7 @@ void SetFaviconImpl(Profile* profile,

favicon_service->SetFavicons(node->url(), icon_url, favicon_base::FAVICON,

image);

} else {

- ProfileSyncService* pss =

+ browser_sync::ProfileSyncService* pss =

ProfileSyncServiceFactory::GetForProfile(profile);

sync_bookmarks::BookmarkChangeProcessor::ApplyBookmarkFavicon(

node, pss->GetSyncClient(), icon_url, image.As1xPNGBytes());

@@ -829,10 +829,11 @@ namespace {

class CountBookmarksWithTitlesMatchingChecker

: public SingleClientStatusChangeChecker {

public:

- CountBookmarksWithTitlesMatchingChecker(ProfileSyncService* service,

- int profile_index,

- const std::string& title,

- int expected_count)

+ CountBookmarksWithTitlesMatchingChecker(

+ browser_sync::ProfileSyncService* service,

+ int profile_index,

+ const std::string& title,

+ int expected_count)

: SingleClientStatusChangeChecker(service),

profile_index_(profile_index),

title_(title),

@@ -860,7 +861,7 @@ class CountBookmarksWithTitlesMatchingChecker

bool AwaitCountBookmarksWithTitlesMatching(int profile,

const std::string& title,

int expected_count) {

- ProfileSyncService* service =

+ browser_sync::ProfileSyncService* service =

sync_datatype_helper::test()->GetSyncService(profile);

CountBookmarksWithTitlesMatchingChecker checker(service,

profile,