| 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/test/integration/preferences_helper.h" | 6 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
| 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
| 9 #include "chrome/browser/sync/test/integration/sync_test.h" | 9 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 10 #include "chrome/browser/translate/chrome_translate_client.h" | 10 #include "chrome/browser/translate/chrome_translate_client.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 } | 58 } |
| 59 | 59 |
| 60 // TCM ID - 7260488. | 60 // TCM ID - 7260488. |
| 61 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Race) { | 61 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, Race) { |
| 62 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 62 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 63 DisableVerifier(); | 63 DisableVerifier(); |
| 64 | 64 |
| 65 ASSERT_TRUE(StringPrefMatches(prefs::kHomePage)); | 65 ASSERT_TRUE(StringPrefMatches(prefs::kHomePage)); |
| 66 | 66 |
| 67 ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0"); | 67 ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0"); |
| 68 ChangeStringPref(1, prefs::kHomePage,"http://www.google.com/1"); | 68 ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1"); |
| 69 ASSERT_TRUE(AwaitQuiescence()); | 69 ASSERT_TRUE(AwaitQuiescence()); |
| 70 ASSERT_TRUE(StringPrefMatches(prefs::kHomePage)); | 70 ASSERT_TRUE(StringPrefMatches(prefs::kHomePage)); |
| 71 } | 71 } |
| 72 | 72 |
| 73 // TCM ID - 3649278. | 73 // TCM ID - 3649278. |
| 74 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 74 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
| 75 kPasswordManagerEnabled) { | 75 kPasswordManagerEnabled) { |
| 76 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 76 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 77 ASSERT_TRUE( | 77 ASSERT_TRUE( |
| 78 BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled)); | 78 BooleanPrefMatches(password_manager::prefs::kPasswordManagerEnabled)); |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 508 | 508 |
| 509 ChangeStringPref(0, prefs::kAcceptLanguages, "en-US"); | 509 ChangeStringPref(0, prefs::kAcceptLanguages, "en-US"); |
| 510 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 510 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 511 ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); | 511 ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); |
| 512 | 512 |
| 513 ChangeStringPref(0, prefs::kAcceptLanguages, "ar,en-US"); | 513 ChangeStringPref(0, prefs::kAcceptLanguages, "ar,en-US"); |
| 514 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 514 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 515 ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); | 515 ASSERT_TRUE(StringPrefMatches(prefs::kAcceptLanguages)); |
| 516 } | 516 } |
| 517 | 517 |
| 518 // TCM ID - 7590682 | |
| 519 #if defined(TOOLKIT_GTK) | |
| 520 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, kUsesSystemTheme) { | |
| 521 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | |
| 522 ASSERT_TRUE(BooleanPrefMatches(prefs::kUsesSystemTheme)); | |
| 523 | |
| 524 ChangeBooleanPref(0, prefs::kUsesSystemTheme); | |
| 525 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 526 ASSERT_FALSE(BooleanPrefMatches(prefs::kUsesSystemTheme)); | |
| 527 } | |
| 528 #endif // TOOLKIT_GTK | |
| 529 | |
| 530 // TCM ID - 6473347. | 518 // TCM ID - 6473347. |
| 531 #if defined(OS_CHROMEOS) | 519 #if defined(OS_CHROMEOS) |
| 532 // Disabled, http://crbug.com/351159 . | 520 // Disabled, http://crbug.com/351159 . |
| 533 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DISABLED_kTapToClickEnabled
) { | 521 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
| 522 DISABLED_kTapToClickEnabled) { |
| 534 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 523 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 535 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); | 524 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); |
| 536 | 525 |
| 537 ChangeBooleanPref(0, prefs::kTapToClickEnabled); | 526 ChangeBooleanPref(0, prefs::kTapToClickEnabled); |
| 538 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 527 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 539 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); | 528 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); |
| 540 | 529 |
| 541 ChangeBooleanPref(1, prefs::kTapToClickEnabled); | 530 ChangeBooleanPref(1, prefs::kTapToClickEnabled); |
| 542 ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0))); | 531 ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0))); |
| 543 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); | 532 ASSERT_TRUE(BooleanPrefMatches(prefs::kTapToClickEnabled)); |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 621 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 610 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 622 ASSERT_TRUE(IsEncryptionComplete(0)); | 611 ASSERT_TRUE(IsEncryptionComplete(0)); |
| 623 ASSERT_TRUE(IsEncryptionComplete(1)); | 612 ASSERT_TRUE(IsEncryptionComplete(1)); |
| 624 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 613 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
| 625 | 614 |
| 626 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 615 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 627 ChangeBooleanPref(0, prefs::kShowHomeButton); | 616 ChangeBooleanPref(0, prefs::kShowHomeButton); |
| 628 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 617 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 629 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); | 618 ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton)); |
| 630 } | 619 } |
| OLD | NEW |