chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc - Issue 1803001: Fix second-profile dir so that it's a sibling of the first; eliminate a FromWStringHack.

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/test/live_sync/two_client_live_bookmarks_sync_test.cc

Issue 1803001: Fix second-profile dir so that it's a sibling of the first; eliminate a FromWStringHack. (Closed) Base URL: git://codf21.jail/chromium.git

Patch Set: Formatting fixes. Created 10 years, 8 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/test/live_sync/single_client_live_preferences_sync_unittest.cc ('k') | chrome/test/live_sync/two_client_live_preferences_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

index bfae3c7770dadd0a7e1daf7cdbd39ff201812ac2..03691b019b82ac1425ad57638c3f261fedf1fc32 100644

--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

@@ -36,7 +36,7 @@ class TwoClientLiveBookmarksSyncTest : public LiveSyncTest {

}

virtual ~TwoClientLiveBookmarksSyncTest() {}

bool SetupSync() {

- profile2_.reset(MakeProfile(L"client2"));

+ profile2_.reset(MakeProfile(FILE_PATH_LITERAL("client2")));

client1_.reset(new ProfileSyncServiceTestHarness(

browser()->profile(), username_, password_));

client2_.reset(new ProfileSyncServiceTestHarness(

@@ -2361,7 +2361,7 @@ IN_PROC_BROWSER_TEST_F(LiveSyncTestBasicHierarchy50BMBothClients,

// Test Scribe ID - 373508.

IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,

MC_SimpleMergeOfDifferentBMModels) {

- set_profile2(MakeProfile(L"client2"));

+ set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));

BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();

BookmarkModel* model_two = profile2()->GetBookmarkModel();

LiveSyncTest::BlockUntilLoaded(model_two);

@@ -2430,7 +2430,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,

// Test Scribe ID - 386586.

IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,

MC_MergeSimpleBMHierarchyUnderBMBar) {

- set_profile2(MakeProfile(L"client2"));

+ set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));

BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();

BookmarkModel* model_two = profile2()->GetBookmarkModel();

LiveSyncTest::BlockUntilLoaded(model_two);

@@ -2487,7 +2487,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,

// Test Scribe ID - 386589.

IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,

MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {

- set_profile2(MakeProfile(L"client2"));

+ set_profile2(MakeProfile(FILE_PATH_LITERAL("client2")));

BookmarkModel* model_one = browser()->profile()->GetBookmarkModel();

BookmarkModel* model_two = profile2()->GetBookmarkModel();

LiveSyncTest::BlockUntilLoaded(model_two);