Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8570)

Unified Diff: chrome/test/live_sync/two_client_live_preferences_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/two_client_live_bookmarks_sync_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/two_client_live_preferences_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
index 2a587bcdd0044b1d20fcc806f41321beb4b88d44..04b4ee446f44f78480725b10e75fb7a4b20c1215 100644
--- a/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_preferences_sync_test.cc
@@ -24,7 +24,7 @@ class TwoClientLivePreferencesSyncTest : public LiveSyncTest {
void SetupSync() {
client1_.reset(new ProfileSyncServiceTestHarness(
browser()->profile(), username_, password_));
- profile2_.reset(MakeProfile(L"client2"));
+ profile2_.reset(MakeProfile(FILE_PATH_LITERAL("client2")));
client2_.reset(new ProfileSyncServiceTestHarness(
profile2_.get(), username_, password_));
EXPECT_TRUE(client1_->SetupSync());
@@ -58,7 +58,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, Sanity) {
EXPECT_EQ(false, prefs1()->GetBoolean(prefs::kHomePageIsNewTabPage));
EXPECT_EQ(false, prefs2()->GetBoolean(prefs::kHomePageIsNewTabPage));
- PrefService* expected = LiveSyncTest::MakeProfile(L"verifier")->GetPrefs();
+ PrefService* expected = LiveSyncTest::MakeProfile(
+ FILE_PATH_LITERAL("verifier"))->GetPrefs();
expected->SetBoolean(prefs::kHomePageIsNewTabPage, true);
prefs1()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
« no previous file with comments | « chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698