Remove "Modifier" from RestoreDefaultKeyboardModifierRemappings

- Remove "Modifier" from the method name since it'll also be
  responsible for resetting the six pack key remappings.

Context: https://crrev.com/c/4585862/comment/15629039_1d45f79a/

Change-Id: I03ecd63a09a19e8f0e3168c2206eaa618bfc3039
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4619527
Reviewed-by: David Padlipsky <dpad@google.com>
Reviewed-by: Matthew Denton <mpdenton@chromium.org>
Commit-Queue: Michael Checo <michaelcheco@google.com>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1159171}

ash/public/cpp/input_device_settings_controller.h

@@ -82,9 +82,9 @@ class ASH_PUBLIC_EXPORT InputDeviceSettingsController {
   // settings.
   virtual const mojom::MousePolicies& GetMousePolicies() = 0;
 
-  // Restore the keyboard modifier remappings to its default mappings for
+  // Restore the keyboard remappings to its default mappings for
   // keyboard of `id`.
-  virtual void RestoreDefaultKeyboardModifierRemappings(DeviceId id) = 0;
+  virtual void RestoreDefaultKeyboardRemappings(DeviceId id) = 0;
   // Configure the settings for keyboard of `id` with the provided
   // `settings`.
   virtual void SetKeyboardSettings(DeviceId id,

ash/public/cpp/test/mock_input_device_settings_controller.h

@@ -62,7 +62,7 @@ class ASH_PUBLIC_EXPORT MockInputDeviceSettingsController
               (DeviceId id, mojom::KeyboardSettingsPtr settings),
               (override));
   MOCK_METHOD(void,
-              RestoreDefaultKeyboardModifierRemappings,
+              RestoreDefaultKeyboardRemappings,
               (DeviceId id),
               (override));
   MOCK_METHOD(void,

ash/system/input_device_settings/input_device_settings_controller_impl.cc

@@ -949,8 +949,8 @@ void InputDeviceSettingsControllerImpl::OnPointingStickListUpdated(
   RefreshStoredLoginScreenPointingStickSettings();
 }
 
-void InputDeviceSettingsControllerImpl::
-    RestoreDefaultKeyboardModifierRemappings(DeviceId id) {
+void InputDeviceSettingsControllerImpl::RestoreDefaultKeyboardRemappings(
+    DeviceId id) {
   DCHECK(base::Contains(keyboards_, id));
   auto& keyboard = *keyboards_.at(id);
   mojom::KeyboardSettingsPtr new_settings = keyboard.settings->Clone();

ash/system/input_device_settings/input_device_settings_controller_impl.h

@@ -85,7 +85,7 @@ class ASH_EXPORT InputDeviceSettingsControllerImpl
       std::vector<ui::InputDevice> pointing_sticks_to_add,
       std::vector<DeviceId> pointing_stick_ids_to_remove);
   bool GetGeneralizedTopRowAreFKeys();
-  void RestoreDefaultKeyboardModifierRemappings(DeviceId id) override;
+  void RestoreDefaultKeyboardRemappings(DeviceId id) override;
 
   // SessionObserver:
   void OnActiveUserPrefServiceChanged(PrefService* pref_service) override;

ash/system/input_device_settings/input_device_settings_controller_unittest.cc

@@ -821,8 +821,7 @@ TEST_F(InputDeviceSettingsControllerTest,
       Shell::Get()->session_controller()->GetActivePrefService());
 }
 
-TEST_F(InputDeviceSettingsControllerTest,
-       RestoreDefaultKeyboardModifierRemappings) {
+TEST_F(InputDeviceSettingsControllerTest, RestoreDefaultKeyboardRemappings) {
   base::HistogramTester histogram_tester;
 
   ui::DeviceDataManagerTestApi().SetKeyboardDevices({kSampleKeyboardInternal});
@@ -839,7 +838,7 @@ TEST_F(InputDeviceSettingsControllerTest,
       controller_->GetKeyboardSettings((DeviceId)kSampleKeyboardInternal.id)
           ->modifier_remappings.size(),
       1u);
-  controller_->RestoreDefaultKeyboardModifierRemappings(
+  controller_->RestoreDefaultKeyboardRemappings(
       (DeviceId)kSampleKeyboardInternal.id);
   EXPECT_EQ(
       controller_->GetKeyboardSettings((DeviceId)kSampleKeyboardInternal.id)

chrome/browser/resources/settings/chromeos/device_page/fake_input_device_settings_provider.ts

@@ -146,7 +146,7 @@ export class FakeInputDeviceSettingsProvider implements
     return this.methods.resolveMethod('fakeGraphicsTablets');
   }
 
-  restoreDefaultKeyboardModifierRemappings(id: number): void {
+  restoreDefaultKeyboardRemappings(id: number): void {
     const keyboards = this.methods.getResult('fakeKeyboards');
     for (const keyboard of keyboards) {
       if (keyboard.id === id) {

chrome/browser/resources/settings/chromeos/device_page/input_device_settings_types.ts

@@ -103,7 +103,7 @@ export interface GraphicsTabletObserverInterface {
 
 interface FakeInputDeviceSettingsProviderInterface extends
     InputDeviceSettingsProviderTypes.InputDeviceSettingsProviderInterface {
-  RestoreDefaultKeyboardModifierRemappings(id: number): void;
+  RestoreDefaultKeyboardRemappings(id: number): void;
   setKeyboardSettings(id: number, settings: KeyboardSettings): void;
   setMouseSettings(id: number, settings: MouseSettings): void;
   setTouchpadSettings(id: number, settings: TouchpadSettings): void;

chrome/browser/resources/settings/chromeos/device_page/per_device_keyboard_remap_keys.ts

@@ -319,7 +319,7 @@ export class SettingsPerDeviceKeyboardRemapKeysElement extends
   }
 
   restoreDefaults(): void {
-    this.inputDeviceSettingsProvider.restoreDefaultKeyboardModifierRemappings(
+    this.inputDeviceSettingsProvider.restoreDefaultKeyboardRemappings(
         this.keyboardId);
   }
 

chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.cc

@@ -69,12 +69,12 @@ void InputDeviceSettingsProvider::BindInterface(
   receiver_.Bind(std::move(receiver));
 }
 
-void InputDeviceSettingsProvider::RestoreDefaultKeyboardModifierRemappings(
+void InputDeviceSettingsProvider::RestoreDefaultKeyboardRemappings(
     uint32_t device_id) {
   DCHECK(features::IsInputDeviceSettingsSplitEnabled());
   DCHECK(InputDeviceSettingsController::Get());
-  InputDeviceSettingsController::Get()
-      ->RestoreDefaultKeyboardModifierRemappings(device_id);
+  InputDeviceSettingsController::Get()->RestoreDefaultKeyboardRemappings(
+      device_id);
 }
 
 void InputDeviceSettingsProvider::SetKeyboardSettings(

chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.h

@@ -38,7 +38,7 @@ class InputDeviceSettingsProvider
       override;
   void ObserveMouseSettings(
       mojo::PendingRemote<mojom::MouseSettingsObserver> observer) override;
-  void RestoreDefaultKeyboardModifierRemappings(uint32_t device_id) override;
+  void RestoreDefaultKeyboardRemappings(uint32_t device_id) override;
   void SetKeyboardSettings(uint32_t device_id,
                            ::ash::mojom::KeyboardSettingsPtr settings) override;
   void SetPointingStickSettings(

chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.mojom

@@ -63,8 +63,8 @@ interface InputDeviceSettingsProvider {
   // The observer which is registered is immediately informed
   // of the current state via its ObserveMouseSettings function.
   ObserveMouseSettings(pending_remote<MouseSettingsObserver> observer);
-  // Restore the keyboard modifier remappings to default base on its id.
-  RestoreDefaultKeyboardModifierRemappings(uint32 device_id);
+  // Restore the keyboard remappings to default base on its id.
+  RestoreDefaultKeyboardRemappings(uint32 device_id);
   // Sets the keyboard settings based on its id.
   SetKeyboardSettings(uint32 device_id, ash.mojom.KeyboardSettings settings);
   // Sets the point stick settings based on its id.

chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider_unittest.cc

@@ -244,8 +244,8 @@ class FakeInputDeviceSettingsController : public InputDeviceSettingsController {
   const ::ash::mojom::MousePolicies& GetMousePolicies() override {
     return *mouse_policies_;
   }
-  void RestoreDefaultKeyboardModifierRemappings(DeviceId id) override {
-    ++num_times_restore_default_keyboard_modifier_remappings_called_;
+  void RestoreDefaultKeyboardRemappings(DeviceId id) override {
+    ++num_times_restore_default_keyboard_remappings_called_;
   }
   void SetKeyboardSettings(
       DeviceId id,
@@ -342,8 +342,8 @@ class FakeInputDeviceSettingsController : public InputDeviceSettingsController {
     pointing_sticks_.erase(iter);
     observer_->OnPointingStickDisconnected(*temp_pointing_stick);
   }
-  int num_times_restore_default_keyboard_modifier_remappings_called() {
-    return num_times_restore_default_keyboard_modifier_remappings_called_;
+  int num_times_restore_default_keyboard_remappings_called() {
+    return num_times_restore_default_keyboard_remappings_called_;
   }
   int num_times_set_keyboard_settings_called() {
     return num_times_set_keyboard_settings_called_;
@@ -369,7 +369,7 @@ class FakeInputDeviceSettingsController : public InputDeviceSettingsController {
       ::ash::mojom::MousePolicies::New();
 
   raw_ptr<InputDeviceSettingsController::Observer> observer_ = nullptr;
-  int num_times_restore_default_keyboard_modifier_remappings_called_ = 0;
+  int num_times_restore_default_keyboard_remappings_called_ = 0;
   int num_times_set_keyboard_settings_called_ = 0;
   int num_times_set_pointing_stick_settings_called_ = 0;
   int num_times_set_mouse_settings_called_ = 0;
@@ -418,23 +418,20 @@ TEST_F(InputDeviceSettingsProviderTest, TestSetKeyboardSettings) {
   EXPECT_EQ(2, controller_->num_times_set_keyboard_settings_called());
 }
 
-TEST_F(InputDeviceSettingsProviderTest,
-       TestRestoreDefaultKeyboardModifierRemappings) {
+TEST_F(InputDeviceSettingsProviderTest, TestRestoreDefaultKeyboardRemappings) {
   controller_->AddKeyboard(kKeyboard1.Clone());
-  provider_->RestoreDefaultKeyboardModifierRemappings(kKeyboard1.id);
+  provider_->RestoreDefaultKeyboardRemappings(kKeyboard1.id);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(
-      1, controller_
-             ->num_times_restore_default_keyboard_modifier_remappings_called());
+      1, controller_->num_times_restore_default_keyboard_remappings_called());
 
   controller_->AddKeyboard(kKeyboard2.Clone());
-  provider_->RestoreDefaultKeyboardModifierRemappings(kKeyboard2.id);
+  provider_->RestoreDefaultKeyboardRemappings(kKeyboard2.id);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(
-      2, controller_
-             ->num_times_restore_default_keyboard_modifier_remappings_called());
+      2, controller_->num_times_restore_default_keyboard_remappings_called());
 }
 
 TEST_F(InputDeviceSettingsProviderTest, TestSetPointingStickSettings) {

chrome/test/data/webui/settings/chromeos/device_page/fake_input_device_settings_provider_test.ts

@@ -105,10 +105,10 @@ suite('FakeInputDeviceSettings', () => {
     assertDeepEquals(updatedFirstPointingStick, result[0]);
   });
 
-  test('restoreDefaultKeyboardModifierRemappings', async () => {
+  test('restoreDefaultKeyboardRemappings', async () => {
     provider.setFakeKeyboards(fakeKeyboards);
-    // Restore the default modifier remappings for the first keyboard settings.
-    provider.restoreDefaultKeyboardModifierRemappings(fakeKeyboards[0]!.id!);
+    // Restore the default remappings for the first keyboard settings.
+    provider.restoreDefaultKeyboardRemappings(fakeKeyboards[0]!.id!);
     // Verify if the first keyboard settings are updated.
     const result = await provider.getConnectedKeyboardSettings();
     assertDeepEquals(result[0]!.settings!.modifierRemappings, {