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

Side by Side Diff: chrome/browser/sync/test/integration/single_client_preferences_sync_test.cc

Issue 7841007: Rename browser/sync/test/live_sync directory to browser/sync/test/integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/live_sync/preferences_helper.h" 7 #include "chrome/browser/sync/test/integration/preferences_helper.h"
8 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 9
10 using preferences_helper::BooleanPrefMatches; 10 using preferences_helper::BooleanPrefMatches;
11 using preferences_helper::ChangeBooleanPref; 11 using preferences_helper::ChangeBooleanPref;
12 12
13 class SingleClientPreferencesSyncTest : public LiveSyncTest { 13 class SingleClientPreferencesSyncTest : public SyncTest {
14 public: 14 public:
15 SingleClientPreferencesSyncTest() : LiveSyncTest(SINGLE_CLIENT) {} 15 SingleClientPreferencesSyncTest() : SyncTest(SINGLE_CLIENT) {}
16 virtual ~SingleClientPreferencesSyncTest() {} 16 virtual ~SingleClientPreferencesSyncTest() {}
17 17
18 private: 18 private:
19 DISALLOW_COPY_AND_ASSIGN(SingleClientPreferencesSyncTest); 19 DISALLOW_COPY_AND_ASSIGN(SingleClientPreferencesSyncTest);
20 }; 20 };
21 21
22 IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest, Sanity) { 22 IN_PROC_BROWSER_TEST_F(SingleClientPreferencesSyncTest, Sanity) {
23 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 23 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
24 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); 24 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
25 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); 25 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
26 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( 26 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
27 "Waiting for prefs change.")); 27 "Waiting for prefs change."));
28 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); 28 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
29 } 29 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698