Remove the last usages of PrefObserver outside of Prefs.

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/stringprintf.h"
 #include "chrome/browser/api/prefs/pref_member.h"
@@ skipping 465 matching lines @@
                                       keycode_super_r_,
                                       Mod1Mask));
 }
 
 // For crbug.com/133896.
 TEST_F(EventRewriterTest, TestRewriteCommandToControlWithControlRemapped) {
   // Remap Control to Alt.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+  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.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_MENU,
                                       ui::EF_ALT_DOWN,
@@ skipping 579 matching lines @@
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask |
                                       Mod4Mask));
 }
 
 TEST_F(EventRewriterTest, TestRewriteModifiersDisableSome) {
   // Disable Search and Control keys.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember search;
-  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs);
   search.SetValue(chromeos::input_method::kVoidKey);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
   control.SetValue(chromeos::input_method::kVoidKey);
 
   EventRewriter rewriter;
   rewriter.set_pref_service_for_testing(&prefs);
 
   // Press left Alt with Shift. This key press shouldn't be affected by the
   // pref. Confirm the event is not rewritten.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_MENU,
                                       ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
@@ skipping 75 matching lines @@
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_A,
                                       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       ControlMask | Mod1Mask | Mod4Mask));
 
   // Remap Alt to Control.
   IntegerPrefMember alt;
-  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
   alt.SetValue(chromeos::input_method::kControlKey);
 
   // Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L
   // even though the Control key itself is disabled.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
@@ skipping 18 matching lines @@
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod1Mask));
 }
 
 TEST_F(EventRewriterTest, TestRewriteModifiersRemapToControl) {
   // Remap Search to Control.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember search;
-  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+  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,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_l_,
                                       0U));
 
   // Remap Alt to Control too.
   IntegerPrefMember alt;
-  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
   alt.SetValue(chromeos::input_method::kControlKey);
 
   // Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
@@ skipping 77 matching lines @@
                                       ui::ET_KEY_PRESSED,
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask));
 }
 
 TEST_F(EventRewriterTest, TestRewriteModifiersRemapMany) {
   // Remap Search to Alt.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember search;
-  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+  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,
                                       ui::ET_KEY_PRESSED,
                                       keycode_alt_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_LWIN,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_l_,
                                       0U));
 
   // Remap Alt to Control.
   IntegerPrefMember alt;
-  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs, NULL);
+  alt.Init(prefs::kLanguageRemapAltKeyTo, &prefs);
   alt.SetValue(chromeos::input_method::kControlKey);
 
   // Press left Alt. Confirm the event is now VKEY_CONTROL + XK_Control_L.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CONTROL,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
                                       keycode_control_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
                                       ui::VKEY_MENU,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_alt_l_,
                                       0U));
 
   // Remap Control to Search.
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
   control.SetValue(chromeos::input_method::kSearchKey);
 
   // Press left Control. Confirm the event is now VKEY_LWIN.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_LWIN,
                                       0,
                                       ui::ET_KEY_PRESSED,
                                       keycode_super_l_,
                                       0U,
                                       KeyPress),
             GetRewrittenEventAsString(&rewriter,
@@ skipping 50 matching lines @@
                                       keycode_b_,
                                       ShiftMask | ControlMask | Mod1Mask |
                                       Mod4Mask));
 }
 
 TEST_F(EventRewriterTest, TestRewriteModifiersRemapToCapsLock) {
   // Remap Search to Caps Lock.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember search;
-  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+  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_);
 
   // Press Search.
   EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_CAPITAL,
@@ skipping 154 matching lines @@
                                       0U));
   EXPECT_TRUE(xkeyboard.caps_lock_is_enabled_);
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 TEST_F(EventRewriterTest, TestRewriteCapsLockToControl) {
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+  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,
                                       ui::EF_CONTROL_DOWN,
                                       ui::ET_KEY_PRESSED,
@@ skipping 34 matching lines @@
                                       ui::ET_KEY_PRESSED,
                                       keycode_a_,
                                       Mod1Mask | Mod3Mask));
 }
 
 TEST_F(EventRewriterTest, DISABLED_TestRewriteCapsLockToControlWithFlag) {
   // TODO(yusukes): Reenable the test once build servers are upgraded.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+  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());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kHasChromeOSKeyboard, "");
@@ skipping 25 matching lines @@
                                       Mod3Mask));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 TEST_F(EventRewriterTest, TestRewriteCapsLockMod3InUse) {
   // Remap CapsLock to Control.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapCapsLockKeyTo, &prefs, NULL);
+  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,
@@ skipping 193 matching lines @@
                                         Mod4Mask |
                                         chromeos_tests[i].input_native_mods));
   }
 
   // Make Search key act like a Function key for accessing extended key
   // bindings.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kEnableChromebookFunctionKey, "");
   BooleanPrefMember search_key_as_function_key;
   search_key_as_function_key.Init(prefs::kLanguageSearchKeyActsAsFunctionKey,
-                                  &prefs, NULL);
+                                  &prefs);
   search_key_as_function_key.SetValue(true);
 
 
   // An external keyboard should still not be remapped.
   rewriter.set_force_chromeos_keyboard_for_testing(false);
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(default_tests); ++i) {
     EXPECT_EQ(GetExpectedResultAsString(default_tests[i].output,
                                         default_tests[i].output_mods,
                                         ui::ET_KEY_PRESSED,
@@ skipping 323 matching lines @@
                                         Mod4Mask));
   }
 
   // Make Search key act like a Function key for accessing extended key
   // bindings. Now Search key as a modifier will make the number row
   // act like the F<number> row.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kEnableChromebookFunctionKey, "");
   BooleanPrefMember search_key_as_function_key;
   search_key_as_function_key.Init(prefs::kLanguageSearchKeyActsAsFunctionKey,
-                                  &prefs, NULL);
+                                  &prefs);
   search_key_as_function_key.SetValue(true);
 
   // Without a Search key modifier, the results should be the same as before.
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(chromeos_tests); ++i) {
     EXPECT_EQ(GetExpectedResultAsString(chromeos_tests[i].output,
                                         0,
                                         ui::ET_KEY_PRESSED,
                                         chromeos_tests[i].output_native,
                                         0U,
                                         KeyPress),
@@ skipping 72 matching lines @@
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 TEST_F(EventRewriterTest, TestRewriteBackspaceAndArrowKeysWithSearchRemapped) {
   const CommandLine original_cl(*CommandLine::ForCurrentProcess());
 
   // Remap Search to Control.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember search;
-  search.Init(prefs::kLanguageRemapSearchKeyTo, &prefs, NULL);
+  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, "");
   rewriter.set_force_chromeos_keyboard_for_testing(true);
 
   // Alt+Search+Down -> End
@@ skipping 25 matching lines @@
                                       ShiftMask | Mod1Mask | Mod4Mask));
 
   *CommandLine::ForCurrentProcess() = original_cl;
 }
 
 TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
   // Remap Control to Alt.
   TestingPrefService prefs;
   chromeos::Preferences::RegisterUserPrefs(&prefs);
   IntegerPrefMember control;
-  control.Init(prefs::kLanguageRemapControlKeyTo, &prefs, NULL);
+  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;
   {
     XEvent xev;
     InitXKeyEvent(ui::VKEY_CONTROL, 0, ui::ET_KEY_PRESSED,
@@ skipping 12 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