Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/ash/event_rewriter_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/chrome_launcher_prefs.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/event_rewriter_unittest.cc
diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc
index 5c196a1798572e999798ebd802cfc816c9d570e2..208545c48f418015dcee376de7977b6aeb7a07f8 100644
--- a/chrome/browser/ui/ash/event_rewriter_unittest.cc
+++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc
@@ -491,7 +491,7 @@ TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
// Remap Control to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
@@ -1120,7 +1120,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersNoRemapMultipleKeys) {
TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
// Disable Search and Control keys.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kVoidKey);
@@ -1258,7 +1258,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
// Remap Search to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
@@ -1378,7 +1378,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
// Remap Search to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kAltKey);
@@ -1490,7 +1490,7 @@ TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
// Remap Search to Caps Lock.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kCapsLockKey);
@@ -1606,7 +1606,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLock) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1633,7 +1633,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLock) {
TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockWithFlag) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1667,7 +1667,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKey) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1712,7 +1712,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
switches::kHasChromeOSDiamondKey, "");
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
chromeos::input_method::MockXKeyboard xkeyboard;
EventRewriter rewriter;
@@ -1800,7 +1800,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
@@ -1855,7 +1855,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockToControlWithFlag) {
// TODO(yusukes): Reenable the test once build servers are upgraded.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
@@ -1901,7 +1901,7 @@ TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockToControlWithFlag) {
TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
// Remap CapsLock to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs);
control.SetValue(chromeos::input_method::kControlKey);
@@ -1930,7 +1930,7 @@ TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
TEST_F(EventRewriterTest, TestRewriteExtendedKeys) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
EventRewriter rewriter;
rewriter.set_pref_service_for_testing(&prefs);
@@ -2073,7 +2073,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeys) {
TEST_F(EventRewriterTest, TestRewriteFunctionKeys) {
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
EventRewriter rewriter;
rewriter.set_pref_service_for_testing(&prefs);
@@ -2292,7 +2292,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
// Remap Search to Control.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember search;
search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
search.SetValue(chromeos::input_method::kControlKey);
@@ -2337,7 +2337,7 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
// Remap Control to Alt.
TestingPrefServiceSyncable prefs;
- chromeos::Preferences::RegisterUserPrefs(&prefs);
+ chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
control.SetValue(chromeos::input_method::kAltKey);
« no previous file with comments | « chrome/browser/ui/ash/chrome_launcher_prefs.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698