| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 DisableVerifier(); | 315 DisableVerifier(); |
| 316 | 316 |
| 317 ASSERT_TRUE(BooleanPrefMatches( | 317 ASSERT_TRUE(BooleanPrefMatches( |
| 318 prefs::kDeleteBrowsingHistory)); | 318 prefs::kDeleteBrowsingHistory)); |
| 319 ASSERT_TRUE(BooleanPrefMatches( | 319 ASSERT_TRUE(BooleanPrefMatches( |
| 320 prefs::kDeleteDownloadHistory)); | 320 prefs::kDeleteDownloadHistory)); |
| 321 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache)); | 321 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache)); |
| 322 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies)); | 322 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies)); |
| 323 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords)); | 323 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords)); |
| 324 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData)); | 324 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData)); |
| 325 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData)); |
| 325 | 326 |
| 326 ChangeBooleanPref(0, prefs::kDeleteBrowsingHistory); | 327 ChangeBooleanPref(0, prefs::kDeleteBrowsingHistory); |
| 327 ChangeBooleanPref(0, prefs::kDeleteDownloadHistory); | 328 ChangeBooleanPref(0, prefs::kDeleteDownloadHistory); |
| 328 ChangeBooleanPref(0, prefs::kDeleteCache); | 329 ChangeBooleanPref(0, prefs::kDeleteCache); |
| 329 ChangeBooleanPref(0, prefs::kDeleteCookies); | 330 ChangeBooleanPref(0, prefs::kDeleteCookies); |
| 330 ChangeBooleanPref(0, prefs::kDeletePasswords); | 331 ChangeBooleanPref(0, prefs::kDeletePasswords); |
| 331 ChangeBooleanPref(0, prefs::kDeleteFormData); | 332 ChangeBooleanPref(0, prefs::kDeleteFormData); |
| 333 ChangeBooleanPref(0, prefs::kDeleteHostedAppsData); |
| 332 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 334 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 333 ASSERT_TRUE(BooleanPrefMatches( | 335 ASSERT_TRUE(BooleanPrefMatches( |
| 334 prefs::kDeleteBrowsingHistory)); | 336 prefs::kDeleteBrowsingHistory)); |
| 335 ASSERT_TRUE(BooleanPrefMatches( | 337 ASSERT_TRUE(BooleanPrefMatches( |
| 336 prefs::kDeleteDownloadHistory)); | 338 prefs::kDeleteDownloadHistory)); |
| 337 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache)); | 339 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCache)); |
| 338 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies)); | 340 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteCookies)); |
| 339 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords)); | 341 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeletePasswords)); |
| 340 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData)); | 342 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteFormData)); |
| 343 ASSERT_TRUE(BooleanPrefMatches(prefs::kDeleteHostedAppsData)); |
| 341 } | 344 } |
| 342 | 345 |
| 343 // TCM ID - 3686300. | 346 // TCM ID - 3686300. |
| 344 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 347 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
| 345 kWebKitUsesUniversalDetector) { | 348 kWebKitUsesUniversalDetector) { |
| 346 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 349 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 347 ASSERT_TRUE(BooleanPrefMatches( | 350 ASSERT_TRUE(BooleanPrefMatches( |
| 348 prefs::kWebKitUsesUniversalDetector)); | 351 prefs::kWebKitUsesUniversalDetector)); |
| 349 | 352 |
| 350 ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector); | 353 ChangeBooleanPref(0, prefs::kWebKitUsesUniversalDetector); |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES)); | 678 ASSERT_TRUE(IsEncrypted(0, syncable::PREFERENCES)); |
| 676 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES)); | 679 ASSERT_TRUE(IsEncrypted(1, syncable::PREFERENCES)); |
| 677 ASSERT_TRUE(BooleanPrefMatches( | 680 ASSERT_TRUE(BooleanPrefMatches( |
| 678 prefs::kHomePageIsNewTabPage)); | 681 prefs::kHomePageIsNewTabPage)); |
| 679 | 682 |
| 680 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 683 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 681 ChangeBooleanPref(0, prefs::kShowHomeButton); | 684 ChangeBooleanPref(0, prefs::kShowHomeButton); |
| 682 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 685 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 683 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 686 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 684 } | 687 } |
| OLD | NEW |