Chromium Code Reviews| 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/prefs/scoped_user_pref_update.h" | 5 #include "chrome/browser/prefs/scoped_user_pref_update.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/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
| 9 #include "chrome/test/live_sync/live_preferences_sync_test.h" | 9 #include "chrome/test/live_sync/live_preferences_sync_test.h" |
| 10 | 10 |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 720 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 720 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 721 ASSERT_TRUE(translate_client1_prefs.IsSiteBlacklisted(host)); | 721 ASSERT_TRUE(translate_client1_prefs.IsSiteBlacklisted(host)); |
| 722 | 722 |
| 723 translate_client0_prefs.RemoveSiteFromBlacklist(host); | 723 translate_client0_prefs.RemoveSiteFromBlacklist(host); |
| 724 ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host)); | 724 ASSERT_FALSE(translate_client0_prefs.IsSiteBlacklisted(host)); |
| 725 | 725 |
| 726 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 726 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 727 ASSERT_FALSE(translate_client1_prefs.IsSiteBlacklisted(host)); | 727 ASSERT_FALSE(translate_client1_prefs.IsSiteBlacklisted(host)); |
| 728 } | 728 } |
| 729 | 729 |
| 730 // TCM ID - 6515252. | |
| 730 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, | 731 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, |
| 731 kExtensionsUIDeveloperMode) { | 732 kExtensionsUIDeveloperMode) { |
| 732 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 733 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 733 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kExtensionsUIDeveloperMode), | 734 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kExtensionsUIDeveloperMode), |
| 734 GetPrefs(1)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); | 735 GetPrefs(1)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); |
| 735 | 736 |
| 736 bool new_kExtensionsUIDeveloperMode = !GetPrefs(0)->GetBoolean( | 737 bool new_kExtensionsUIDeveloperMode = !GetPrefs(0)->GetBoolean( |
| 737 prefs::kExtensionsUIDeveloperMode); | 738 prefs::kExtensionsUIDeveloperMode); |
| 738 GetVerifierPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, | 739 GetVerifierPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode, |
| 739 new_kExtensionsUIDeveloperMode); | 740 new_kExtensionsUIDeveloperMode); |
| 740 GetPrefs(0)->SetBoolean(prefs::kExtensionsUIDeveloperMode, | 741 GetPrefs(0)->SetBoolean(prefs::kExtensionsUIDeveloperMode, |
| 741 new_kExtensionsUIDeveloperMode); | 742 new_kExtensionsUIDeveloperMode); |
| 742 | 743 |
| 743 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 744 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 744 | 745 |
| 745 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode), | 746 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode), |
| 746 GetPrefs(0)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); | 747 GetPrefs(0)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); |
| 747 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode), | 748 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode), |
| 748 GetPrefs(1)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); | 749 GetPrefs(1)->GetBoolean(prefs::kExtensionsUIDeveloperMode)); |
| 749 } | 750 } |
| 751 | |
| 752 // TCM ID - 6473347. | |
| 753 #if defined(OS_CHROMEOS) | |
| 754 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, | |
| 755 kTapToClickEnabled) { | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
anna
2011/03/21 21:19:40
We do not have strict indentation style rules on t
anna
2011/03/21 21:19:40
Done.
| |
| 756 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | |
| 757 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kTapToClickEnabled), | |
| 758 GetPrefs(1)->GetBoolean(prefs::kTapToClickEnabled)); | |
| 759 | |
| 760 bool new_kAccessibilityEnabled = !GetPrefs0()-> | |
|
Raghu Simha
2011/03/21 19:32:47
Wrong variable name here. This won't compile on Ch
anna
2011/03/21 21:19:40
Done.
| |
| 761 GetBoolean(prefs::kTapToClickEnabled); | |
| 762 GetVerifierPrefs()->SetBoolean(prefs::kTapToClickEnabled, | |
| 763 new_kTapToClickEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 764 GetPrefs(0)->SetBoolean(prefs::kTapToClickEnabled, | |
| 765 new_kTapToClickEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 766 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 767 | |
| 768 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kTapToClickEnabled), | |
| 769 GetPrefs(1)->GetBoolean(prefs::kTapToClickEnabled )); | |
| 770 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kTapToClickEnabled), | |
| 771 GetPrefs(1)->GetBoolean(prefs::kTapToClickEnabled)); | |
| 772 | |
| 773 GetVerifierPrefs()->SetBoolean(prefs::kTapToClickEnabled, | |
| 774 !new_kTapToClickEnabledd); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 775 GetPrefs(0)->SetBoolean(prefs::kTapToClickEnabled, | |
| 776 !new_kTapToClickEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 777 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 778 | |
| 779 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kTapToClickEnabled), | |
| 780 GetPrefs(1)->GetBoolean(prefs::kTapToClickEnabled )); | |
| 781 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kTapToClickEnabled), | |
| 782 GetPrefs(1)->GetBoolean(prefs::kTapToClickEnabled)); | |
| 783 } | |
| 784 #endif // OS_CHROMEOS | |
| 785 | |
| 786 // TCM ID - 6461774. | |
| 787 #if defined(OS_CHROMEOS) | |
| 788 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, | |
| 789 kAccessibilityEnabled) { | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 790 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | |
| 791 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAccessibilityEnabled), | |
| 792 GetPrefs(1)->GetBoolean(prefs::kAccessibilityEnabled)); | |
| 793 | |
| 794 bool new_kAccessibilityEnabled = !GetPrefs0()-> | |
| 795 GetBoolean(prefs::kAccessibilityEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 796 GetVerifierPrefs()->SetBoolean(prefs::kAccessibilityEnabled, | |
| 797 new_kAccessibilityEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 798 GetPrefs(0)->SetBoolean(prefs::kAccessibilityEnabled, | |
| 799 new_kAccessibilityEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 800 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 801 | |
| 802 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAccessibilityEnabled), | |
| 803 GetPrefs(1)->GetBoolean(prefs::kAccessibilityEnabled )); | |
| 804 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAccessibilityEnabled), | |
| 805 GetPrefs(1)->GetBoolean(prefs::kAccessibilityEnabled)); | |
| 806 | |
| 807 GetVerifierPrefs()->SetBoolean(prefs::kAccessibilityEnabled, | |
| 808 !new_kAccessibilityEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 809 GetPrefs(0)->SetBoolean(prefs::kAccessibilityEnabled, | |
| 810 !new_kAccessibilityEnabled); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 811 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 812 | |
| 813 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kAccessibilityEnabled), | |
| 814 GetPrefs(1)->GetBoolean(prefs::kAccessibilityEnabled )); | |
| 815 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kAccessibilityEnabled), | |
| 816 GetPrefs(1)->GetBoolean(prefs::kAccessibilityEnabled)); | |
| 817 } | |
| 818 #endif // OS_CHROMEOS | |
| 819 | |
| 820 // TCM ID - 6458824. | |
| 821 #if defined(OS_CHROMEOS) | |
| 822 IN_PROC_BROWSER_TEST_F(TwoClientLivePreferencesSyncTest, | |
| 823 kEnableScreenLock) { | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 824 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | |
| 825 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock), | |
| 826 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock)); | |
| 827 | |
| 828 bool new_kAccessibilityEnabled = !GetPrefs0()-> | |
|
Raghu Simha
2011/03/21 19:32:47
Wrong variable name here. This won't compile on Ch
anna
2011/03/21 21:19:40
Done.
| |
| 829 GetBoolean(prefs::kEnableScreenLock); | |
| 830 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock, | |
| 831 new_kEnableScreenLock); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 832 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock, new_kEnableScreenLock); | |
| 833 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 834 | |
| 835 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock), | |
| 836 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock )); | |
| 837 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock), | |
| 838 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock)); | |
| 839 | |
| 840 GetVerifierPrefs()->SetBoolean(prefs::kEnableScreenLock, | |
| 841 !new_kEnableScreenLock); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 842 GetPrefs(0)->SetBoolean(prefs::kEnableScreenLock, | |
| 843 !new_kEnableScreenLock); | |
|
Raghu Simha
2011/03/21 19:32:47
nit: Adjust indentation to align with the line abo
anna
2011/03/21 21:19:40
Done.
| |
| 844 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | |
| 845 | |
| 846 ASSERT_EQ(GetVerifierPrefs()->GetBoolean(prefs::kEnableScreenLock), | |
| 847 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock )); | |
| 848 ASSERT_EQ(GetPrefs(0)->GetBoolean(prefs::kEnableScreenLock), | |
| 849 GetPrefs(1)->GetBoolean(prefs::kEnableScreenLock)); | |
| 850 } | |
| 851 #endif // OS_CHROMEOS | |
| OLD | NEW |