OLD | NEW |
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/browser/sync/profile_sync_service_harness.h" | 5 #include "chrome/browser/sync/profile_sync_service_harness.h" |
6 #include "chrome/common/pref_names.h" | 6 #include "chrome/common/pref_names.h" |
7 #include "chrome/test/live_sync/live_sync_test.h" | 7 #include "chrome/test/live_sync/live_sync_test.h" |
8 #include "chrome/test/live_sync/preferences_helper.h" | 8 #include "chrome/test/live_sync/preferences_helper.h" |
9 | 9 |
| 10 using preferences_helper::BooleanPrefMatches; |
| 11 using preferences_helper::ChangeBooleanPref; |
| 12 |
10 class ManyClientPreferencesSyncTest : public LiveSyncTest { | 13 class ManyClientPreferencesSyncTest : public LiveSyncTest { |
11 public: | 14 public: |
12 ManyClientPreferencesSyncTest() : LiveSyncTest(MANY_CLIENT) {} | 15 ManyClientPreferencesSyncTest() : LiveSyncTest(MANY_CLIENT) {} |
13 virtual ~ManyClientPreferencesSyncTest() {} | 16 virtual ~ManyClientPreferencesSyncTest() {} |
14 | 17 |
15 private: | 18 private: |
16 DISALLOW_COPY_AND_ASSIGN(ManyClientPreferencesSyncTest); | 19 DISALLOW_COPY_AND_ASSIGN(ManyClientPreferencesSyncTest); |
17 }; | 20 }; |
18 | 21 |
19 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed. | 22 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed. |
20 IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) { | 23 IN_PROC_BROWSER_TEST_F(ManyClientPreferencesSyncTest, DISABLED_Sanity) { |
21 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 24 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
22 ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches( | 25 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
23 prefs::kHomePageIsNewTabPage)); | 26 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |
24 PreferencesHelper::ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); | |
25 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients())); | 27 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients())); |
26 ASSERT_TRUE(PreferencesHelper::BooleanPrefMatches( | 28 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
27 prefs::kHomePageIsNewTabPage)); | |
28 } | 29 } |
OLD | NEW |