Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/ash/event_rewriter_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/event_rewriter.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/stringprintf.h"
@@ skipping 473 matching lines @@
                                       ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_r_,
                                       Mod1Mask));
 }
 
 // For crbug.com/133896.
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.DeviceAddedForTesting(0, "PC Keyboard");
   rewriter.set_last_device_id_for_testing(0);
 
   // XK_Control_L (left Control key) should be remapped to Alt.
@@ skipping 608 matching lines @@
                                       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask |
                                       Mod4Mask));
 }
 
 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);
   IntegerPrefMember control;
   control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
   control.SetValue(chromeos::input_method::kVoidKey);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
@@ skipping 117 matching lines @@
                                       ui::VKEY_A,
                                       ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod1Mask));
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Press Search. Confirm the event is now VKEY_CONTROL + XK_Control_L.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
@@ skipping 99 matching lines @@
                                       ui::EF_SHIFT_DOWN |
                                       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask));
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Press Search. Confirm the event is now VKEY_MENU + XK_Alt_L.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_MENU,
                                       ui::EF_ALT_DOWN,
@@ skipping 91 matching lines @@
                                       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask |
                                       Mod4Mask));
 }
 
 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);
 
   chromeos::input_method::MockXKeyboard xkeyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
   EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
 
@@ skipping 95 matching lines @@
                                       LockMask));
   EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
 }
 
 TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLock) {
   // It seems that the X server running on build servers is too old and does not
   // support F16 (i.e. 'XKeysymToKeycode(display_, XF86XK_Launch7)' call).
   // 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;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
   EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
 
   // On Chrome OS, CapsLock is mapped to F16 with Mod3Mask.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
                                       ui::EF_CAPS_LOCK_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_caps_lock_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_F16,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_launch7_,
                                       0U));
   EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
 }
 
 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;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
   EXPECT_FALSE(xkeyboard.caps_lock_is_enabled_);
 
   // F16 should work as CapsLock even when --has-chromeos-keyboard is specified.
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
@@ skipping 13 matching lines @@
                                       0U));
   EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 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;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
 
   // F15 should work as Ctrl when --has-chromeos-diamond-key is not specified.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
@@ skipping 24 matching lines @@
 }
 
 TEST_F(EventRewriterTest, DISABLED_TestRewriteDiamondKeyWithFlag) {
   // TODO(yusukes): Reenable the test once build servers are upgraded.
 
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kHasChromeOSDiamondKey, "");
 
   TestingPrefServiceSyncable prefs;
-  chromeos::Preferences::RegisterUserPrefs(&prefs);
+  chromeos::Preferences::RegisterUserPrefs(&prefs, prefs.registry());
 
   chromeos::input_method::MockXKeyboard xkeyboard;
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   rewriter.set_xkeyboard_for_testing(&xkeyboard);
 
   // By default, F15 should work as Control.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
@@ skipping 67 matching lines @@
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_launch6_,
                                       0U));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Press CapsLock+a. Confirm that Mod3Mask is rewritten to ControlMask.
   // On Chrome OS, CapsLock works as a Mod3 modifier.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_A,
@@ skipping 34 matching lines @@
                                       ui::VKEY_A,
                                       ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod1Mask | Mod3Mask));
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // The prefs::kLanguageRemapCapsLockKeyTo pref should be ignored when
   // --has-chromeos-keyboard is set.
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
@@ skipping 25 matching lines @@
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod3Mask));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
   input_method_manager_mock_->SetCurrentInputMethodId("xkb:de:neo:ger");
 
   // Press CapsLock+a. Confirm that Mod3Mask is NOT rewritten to ControlMask
   // when Mod3Mask is already in use by the current XKB layout.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_A,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod3Mask,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_A,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod3Mask));
 
   input_method_manager_mock_->SetCurrentInputMethodId("xkb:us::eng");
 }
 
 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);
 
   struct {
     ui::KeyboardCode input;
     KeyCode input_native;
     unsigned int input_mods;
     unsigned int input_native_mods;
     ui::KeyboardCode output;
     KeyCode output_native;
@@ skipping 122 matching lines @@
                                         chromeos_tests[i].input,
                                         chromeos_tests[i].input_mods,
                                         ui::ET_KEY_PRESSED,
                                         chromeos_tests[i].input_native,
                                         chromeos_tests[i].input_native_mods));
   }
 }
 
 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);
 
   struct {
     ui::KeyboardCode input;
     KeyCode input_native;
     unsigned int input_native_mods;
     unsigned int input_mods;
     ui::KeyboardCode output;
     KeyCode output_native;
@@ skipping 198 matching lines @@
                                         tests[i].input_native,
                                         tests[i].input_native_mods));
   }
 }
 
 TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
 
   // 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kHasChromeOSKeyboard, "");
 
@@ skipping 24 matching lines @@
                                       ui::ET_KEY_PRESSED,
                                       keycode_down_,
                                       ShiftMask | Mod1Mask | Mod4Mask));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 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);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Send left control press.
   std::string rewritten_event;
   {
@@ skipping 14 matching lines @@
   // flag in the event is True.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             rewritten_event);
 }
 #endif  // OS_CHROMEOS