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 "base/values.h" | 5 #include "base/values.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/translate/translate_prefs.h" | 7 #include "chrome/browser/translate/translate_prefs.h" |
8 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
9 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 9 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 // TCM ID - 3666296. | 170 // TCM ID - 3666296. |
171 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kShowBookmarkBar) { | 171 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kShowBookmarkBar) { |
172 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 172 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
173 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar)); | 173 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar)); |
174 | 174 |
175 ChangeBooleanPref(0, prefs::kShowBookmarkBar); | 175 ChangeBooleanPref(0, prefs::kShowBookmarkBar); |
176 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 176 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
177 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar)); | 177 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowBookmarkBar)); |
178 } | 178 } |
179 | 179 |
180 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kEnableInstant) { | |
csharp
2011/09/14 20:13:22
I'm not sure if this test is correctly setup, I ju
Nicolas Zea
2011/09/14 21:32:12
They do not yet, feel free to add them though. See
csharp
2011/09/15 13:39:12
They have been added.
On 2011/09/14 21:32:12, nze
| |
181 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | |
182 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantConfirmDialogShown)); | |
183 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabled)); | |
184 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabledOnce)); | |
185 | |
186 ChangeBooleanPref(0, prefs::kInstantConfirmDialogShown); | |
187 ChangeBooleanPref(0, prefs::kInstantEnabled); | |
188 ChangeBooleanPref(0, prefs::kInstantEnabledOnce); | |
189 | |
190 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
191 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantConfirmDialogShown)); | |
192 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabled)); | |
193 ASSERT_TRUE(BooleanPrefMatches(prefs::kInstantEnabledOnce)); | |
194 } | |
195 | |
180 // TCM ID - 3611311. | 196 // TCM ID - 3611311. |
181 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kCheckDefaultBrowser) { | 197 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kCheckDefaultBrowser) { |
182 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 198 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
183 DisableVerifier(); | 199 DisableVerifier(); |
184 | 200 |
185 ASSERT_TRUE(BooleanPrefMatches( | 201 ASSERT_TRUE(BooleanPrefMatches( |
186 prefs::kCheckDefaultBrowser)); | 202 prefs::kCheckDefaultBrowser)); |
187 | 203 |
188 ChangeBooleanPref(0, prefs::kCheckDefaultBrowser); | 204 ChangeBooleanPref(0, prefs::kCheckDefaultBrowser); |
189 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 205 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
660 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES)); | 676 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES)); |
661 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES)); | 677 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES)); |
662 ASSERT_TRUE(BooleanPrefMatches( | 678 ASSERT_TRUE(BooleanPrefMatches( |
663 prefs::kHomePageIsNewTabPage)); | 679 prefs::kHomePageIsNewTabPage)); |
664 | 680 |
665 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 681 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
666 ChangeBooleanPref(0, prefs::kShowHomeButton); | 682 ChangeBooleanPref(0, prefs::kShowHomeButton); |
667 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 683 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
668 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 684 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
669 } | 685 } |
OLD | NEW |