Make SetUserLastInputMethodPreferenceForTesting() a static class method

... of InputMethodPersistence.

Manipulating the local state is InputMethodPersistence's responsibility.
This CL makes SetUserLastInputMethodPreferenceForTesting static public
method of it.

No behavior change expected.

[email protected], [email protected]

Bug: 446058312
Change-Id: Ib517bd9a149c0cb5cc29118416ae0750c24d31d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7046709
Reviewed-by: Hidehiko Abe <[email protected]>
Commit-Queue: Antonio Gomes <[email protected]>
Reviewed-by: Jun Ishiguro <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1532373}

Author: tonikitoo

chrome/browser/ash/input_method/input_method_persistence.cc

@@ -44,9 +44,8 @@ AccountId GetUserAccount(Profile* profile) {
   return user->GetAccountId();
 }
 
-static void SetUserLastInputMethodPreference(
-    const AccountId& account_id,
-    const std::string& input_method_id) {
+void SetUserLastInputMethodPreference(const AccountId& account_id,
+                                      const std::string& input_method_id) {
   if (!account_id.is_valid()) {
     return;
   }
@@ -159,7 +158,8 @@ void InputMethodPersistence::PersistUserInputMethod(
   user_prefs->SetString(::prefs::kLanguageCurrentInputMethod, input_method_id);
 }
 
-void SetUserLastInputMethodPreferenceForTesting(
+// static
+void InputMethodPersistence::SetUserLastInputMethodPreferenceForTesting(
     const AccountId& account_id,
     const std::string& input_method) {
   SetUserLastInputMethodPreference(account_id, input_method);

chrome/browser/ash/input_method/input_method_persistence.h

@@ -44,17 +44,18 @@ class InputMethodPersistence : public InputMethodManager::Observer {
   void SetUserLastLoginInputMethodId(const std::string& input_method_id,
                                      Profile* profile);
 
+  // Update user last input method ID into known_user data.
+  static void SetUserLastInputMethodPreferenceForTesting(
+      const AccountId& account_id,
+      const std::string& input_method);
+
  private:
   void PersistUserInputMethod(const std::string& input_method_id,
                               Profile* profile);
 
   raw_ptr<InputMethodManager> input_method_manager_;
 };
 
-void SetUserLastInputMethodPreferenceForTesting(
-    const AccountId& account_id,
-    const std::string& input_method);
-
 }  // namespace input_method
 }  // namespace ash
 

chrome/browser/ash/login/login_ui_keyboard_browsertest.cc

@@ -104,10 +104,12 @@ class LoginUIKeyboardTest : public LoginManagerTest {
   // Should be called from PRE_ test so that local_state is saved to disk, and
   // reloaded in the main test.
   void InitUserLastInputMethod() {
-    input_method::SetUserLastInputMethodPreferenceForTesting(
-        test_users_[0], user_input_methods[0]);
-    input_method::SetUserLastInputMethodPreferenceForTesting(
-        test_users_[1], user_input_methods[1]);
+    input_method::InputMethodPersistence::
+        SetUserLastInputMethodPreferenceForTesting(test_users_[0],
+                                                   user_input_methods[0]);
+    input_method::InputMethodPersistence::
+        SetUserLastInputMethodPreferenceForTesting(test_users_[1],
+                                                   user_input_methods[1]);
   }
 
  protected:
@@ -261,15 +263,18 @@ class LoginUIKeyboardTestWithUsersAndOwner : public LoginManagerTest {
   // Should be called from PRE_ test so that local_state is saved to disk, and
   // reloaded in the main test.
   void InitUserLastInputMethod() {
-    input_method::SetUserLastInputMethodPreferenceForTesting(
-        AccountId::FromUserEmailGaiaId(kTestUser1, kTestUser1GaiaId),
-        user_input_methods[0]);
-    input_method::SetUserLastInputMethodPreferenceForTesting(
-        AccountId::FromUserEmailGaiaId(kTestUser2, kTestUser2GaiaId),
-        user_input_methods[1]);
-    input_method::SetUserLastInputMethodPreferenceForTesting(
-        AccountId::FromUserEmailGaiaId(kTestUser3, kTestUser3GaiaId),
-        user_input_methods[2]);
+    input_method::InputMethodPersistence::
+        SetUserLastInputMethodPreferenceForTesting(
+            AccountId::FromUserEmailGaiaId(kTestUser1, kTestUser1GaiaId),
+            user_input_methods[0]);
+    input_method::InputMethodPersistence::
+        SetUserLastInputMethodPreferenceForTesting(
+            AccountId::FromUserEmailGaiaId(kTestUser2, kTestUser2GaiaId),
+            user_input_methods[1]);
+    input_method::InputMethodPersistence::
+        SetUserLastInputMethodPreferenceForTesting(
+            AccountId::FromUserEmailGaiaId(kTestUser3, kTestUser3GaiaId),
+            user_input_methods[2]);
 
     PrefService* local_state = g_browser_process->local_state();
     local_state->SetString(language_prefs::kPreferredKeyboardLayout,
@@ -477,8 +482,8 @@ IN_PROC_BROWSER_TEST_F(FirstLoginKeyboardTest,
   locker_tester.Lock();
 
   // Clear user input method.
-  input_method::SetUserLastInputMethodPreferenceForTesting(test_user_,
-                                                           std::string());
+  input_method::InputMethodPersistence::
+      SetUserLastInputMethodPreferenceForTesting(test_user_, std::string());
   EXPECT_TRUE(lock_screen_utils::GetUserLastInputMethodId(test_user_).empty());
 
   locker_tester.UnlockWithPassword(test_user_, "password");