Chromium Code Reviews

Side by Side Diff: chrome/test/live_sync/single_client_live_preferences_sync_unittest.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.
Jump to:
View unified diff |
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/browser.h" 6 #include "chrome/browser/browser.h"
7 #include "chrome/browser/pref_service.h" 7 #include "chrome/browser/pref_service.h"
8 #include "chrome/browser/profile.h" 8 #include "chrome/browser/profile.h"
9 #include "chrome/browser/sync/profile_sync_service.h" 9 #include "chrome/browser/sync/profile_sync_service.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 24 matching lines...)
35 35
36 private: 36 private:
37 scoped_ptr<ProfileSyncServiceTestHarness> client_; 37 scoped_ptr<ProfileSyncServiceTestHarness> client_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(SingleClientLivePreferencesSyncTest); 39 DISALLOW_COPY_AND_ASSIGN(SingleClientLivePreferencesSyncTest);
40 }; 40 };
41 41
42 IN_PROC_BROWSER_TEST_F(SingleClientLivePreferencesSyncTest, Sanity) { 42 IN_PROC_BROWSER_TEST_F(SingleClientLivePreferencesSyncTest, Sanity) {
43 SetupSync(); 43 SetupSync();
44 44
45 PrefService* expected = LiveSyncTest::MakeProfile(L"verifier")->GetPrefs(); 45 PrefService* expected = LiveSyncTest::MakeProfile(
46 FILE_PATH_LITERAL("verifier"))->GetPrefs();
46 expected->SetBoolean(prefs::kHomePageIsNewTabPage, true); 47 expected->SetBoolean(prefs::kHomePageIsNewTabPage, true);
47 48
48 prefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true); 49 prefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
49 ASSERT_TRUE(client()->AwaitSyncCycleCompletion("Pref updated")); 50 ASSERT_TRUE(client()->AwaitSyncCycleCompletion("Pref updated"));
50 51
51 ASSERT_EQ(expected->GetBoolean(prefs::kHomePageIsNewTabPage), 52 ASSERT_EQ(expected->GetBoolean(prefs::kHomePageIsNewTabPage),
52 prefs()->GetBoolean(prefs::kHomePageIsNewTabPage)); 53 prefs()->GetBoolean(prefs::kHomePageIsNewTabPage));
53 } 54 }
OLDNEW
« no previous file with comments | « chrome/test/live_sync/live_sync_test.cc ('k') | chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine