Inject login_layout_set to ComponentExtensionIMEManager via delegate.

Certain unit tests are having environment-specific failures due to mixed
usage of hermetic test data and non-hermetic prod configs. This refactor
is in preparation for fixing such non-hermetic-ness.

Besides, it's also in preparation for further reduction in usage of
deprecated input_methods.txt [1][2] (remnant from before the migration
to extension-based input methods circa 2011), towards its full removal.
Nowadays the canonical configs for 1P input methods on CrOS is
google_xkb_manifest.json [3].

[1] https://source.chromium.org/chromium/chromium/src/+/master:chromeos/ime/input_methods.txt;drc=5ab33d25bc676b63e4afbcfade6f9265a5f5a3ea
[2] https://source.chromium.org/chromium/chromium/src/+/master:chromeos/ime/gen_input_methods.py;drc=0303b222088853ce1c0af2bbc7f47937746eda97
[3] https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json;drc=03ae97c2c311ac00d3e9a59203f4921c9e87e707

Bug: 970790, 1134526
Change-Id: I622bb36e8cd054d26431870cb2d0e70a3e1fe472
Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome;luci.chromium.try:linux-chromeos-rel,linux-chromeos-dbg;luci.chromium.try:linux_chromium_chromeos_asan_rel_ng,linux_chromium_chromeos_msan_rel_ng
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2554276
Commit-Queue: Bao-Duy Tran <tranbaoduy@chromium.org>
Reviewed-by: John Palmer <jopalmer@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832332}

chrome/browser/chromeos/BUILD.gn

@@ -193,6 +193,7 @@ source_set("chromeos") {
     "//chromeos/dbus/upstart",
     "//chromeos/disks",
     "//chromeos/geolocation",
+    "//chromeos/ime:gencode",
     "//chromeos/login/auth",
     "//chromeos/login/login_state",
     "//chromeos/login/session",

chrome/browser/chromeos/input_method/component_extension_ime_manager_delegate_impl.cc

@@ -24,6 +24,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/browser_resources.h"
+#include "chromeos/ime/input_methods.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_registry.h"
@@ -162,6 +163,12 @@ void OnFilePathChecked(Profile* profile,
 ComponentExtensionIMEManagerDelegateImpl::
     ComponentExtensionIMEManagerDelegateImpl() {
   ReadComponentExtensionsInfo(&component_extension_list_);
+
+  for (const auto& input_method : input_method::kInputMethods) {
+    if (input_method.is_login_keyboard) {
+      login_layout_set_.insert(input_method.xkb_layout_id);
+    }
+  }
 }
 
 ComponentExtensionIMEManagerDelegateImpl::
@@ -192,6 +199,16 @@ void ComponentExtensionIMEManagerDelegateImpl::Load(
                      base::Owned(copied_file_path)));
 }
 
+bool ComponentExtensionIMEManagerDelegateImpl::IsInLoginLayoutAllowlist(
+    const std::vector<std::string>& layouts) {
+  for (const auto& layout : layouts) {
+    if (login_layout_set_.find(layout) != login_layout_set_.end()) {
+      return true;
+    }
+  }
+  return false;
+}
+
 std::unique_ptr<base::DictionaryValue>
 ComponentExtensionIMEManagerDelegateImpl::GetManifest(
     const std::string& manifest_string) {

chrome/browser/chromeos/input_method/component_extension_ime_manager_delegate_impl.h

@@ -34,6 +34,8 @@ class ComponentExtensionIMEManagerDelegateImpl
             const std::string& extension_id,
             const std::string& manifest,
             const base::FilePath& file_path) override;
+  bool IsInLoginLayoutAllowlist(
+      const std::vector<std::string>& layouts) override;
 
   static bool IsIMEExtensionID(const std::string& id);
 
@@ -64,6 +66,8 @@ class ComponentExtensionIMEManagerDelegateImpl
   // The list of component extension IME.
   std::vector<ComponentExtensionIME> component_extension_list_;
 
+  std::set<std::string> login_layout_set_;
+
   DISALLOW_COPY_AND_ASSIGN(ComponentExtensionIMEManagerDelegateImpl);
 };
 

ui/base/BUILD.gn

@@ -801,7 +801,7 @@ static_library("test_support") {
       "ime/chromeos/mock_input_method_manager.h",
     ]
     deps += [
-      # Generates a header used by component_extension_ime_manager.cc
+      # Generates a header used by mock_component_extension_ime_manager_delegate.cc
       "//chromeos/ime:gencode",
       "//ui/base/ime/chromeos",
     ]

ui/base/ime/chromeos/BUILD.gn

@@ -57,7 +57,6 @@ component("chromeos") {
     ":ime_types",
     "//build:branding_buildflags",
     "//chromeos/constants",
-    "//chromeos/ime:gencode",
     "//chromeos/services/ime/public/mojom",
     "//chromeos/system",
     "//third_party/icu",

ui/base/ime/chromeos/component_extension_ime_manager.cc

@@ -11,7 +11,6 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chromeos/constants/chromeos_switches.h"
-#include "chromeos/ime/input_methods.h"
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 
 namespace chromeos {
@@ -58,11 +57,6 @@ ComponentExtensionIME::~ComponentExtensionIME() = default;
 ComponentExtensionIMEManager::ComponentExtensionIMEManager(
     std::unique_ptr<ComponentExtensionIMEManagerDelegate> delegate)
     : delegate_(std::move(delegate)) {
-  for (const auto& input_method : input_method::kInputMethods) {
-    if (input_method.is_login_keyboard)
-      login_layout_set_.insert(input_method.xkb_layout_id);
-  }
-
   // Creates internal mapping between input method id and engine components.
   std::vector<ComponentExtensionIME> ext_list = delegate_->ListIME();
   for (const auto& ext : ext_list) {
@@ -122,7 +116,7 @@ input_method::InputMethodDescriptors
           ime.language_codes,
           // Enables extension based xkb keyboards on login screen.
           extension_ime_util::IsKeyboardLayoutExtension(input_method_id) &&
-              IsInLoginLayoutAllowlist(layouts),
+              delegate_->IsInLoginLayoutAllowlist(layouts),
           ime.options_page_url, ime.input_view_url));
     }
   }
@@ -159,13 +153,4 @@ bool ComponentExtensionIMEManager::FindEngineEntry(
   return true;
 }
 
-bool ComponentExtensionIMEManager::IsInLoginLayoutAllowlist(
-    const std::vector<std::string>& layouts) {
-  for (const auto& layout : layouts) {
-    if (login_layout_set_.find(layout) != login_layout_set_.end())
-      return true;
-  }
-  return false;
-}
-
 }  // namespace chromeos

ui/base/ime/chromeos/component_extension_ime_manager.h

@@ -94,8 +94,6 @@ class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS) ComponentExtensionIMEManager {
   // It's filled by ctor and never changed during runtime.
   std::set<std::string> input_method_id_set_;
 
-  std::set<std::string> login_layout_set_;
-
   DISALLOW_COPY_AND_ASSIGN(ComponentExtensionIMEManager);
 };
 

ui/base/ime/chromeos/component_extension_ime_manager_delegate.h

@@ -30,6 +30,9 @@ class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
                     const std::string& extension_id,
                     const std::string& manifest,
                     const base::FilePath& path) = 0;
+
+  virtual bool IsInLoginLayoutAllowlist(
+      const std::vector<std::string>& layouts) = 0;
 };
 
 }  // namespace chromeos

ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.cc

@@ -3,13 +3,20 @@
 // found in the LICENSE file.
 
 #include "ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h"
+#include "chromeos/ime/input_methods.h"
 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"
 
 namespace chromeos {
 namespace input_method {
 
 MockComponentExtensionIMEManagerDelegate::
-    MockComponentExtensionIMEManagerDelegate() = default;
+    MockComponentExtensionIMEManagerDelegate() {
+  for (const auto& input_method : input_method::kInputMethods) {
+    if (input_method.is_login_keyboard) {
+      login_layout_set_.insert(input_method.xkb_layout_id);
+    }
+  }
+}
 
 MockComponentExtensionIMEManagerDelegate::
     ~MockComponentExtensionIMEManagerDelegate() = default;
@@ -24,5 +31,16 @@ void MockComponentExtensionIMEManagerDelegate::Load(
     const std::string& extension_id,
     const std::string& manifest,
     const base::FilePath& path) {}
+
+bool MockComponentExtensionIMEManagerDelegate::IsInLoginLayoutAllowlist(
+    const std::vector<std::string>& layouts) {
+  for (const auto& layout : layouts) {
+    if (login_layout_set_.find(layout) != login_layout_set_.end()) {
+      return true;
+    }
+  }
+  return false;
+}
+
 }  // namespace input_method
 }  // namespace chromeos

ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.h

@@ -24,12 +24,15 @@ class COMPONENT_EXPORT(UI_BASE_IME_CHROMEOS)
             const std::string& extension_id,
             const std::string& manifest,
             const base::FilePath& path) override;
+  bool IsInLoginLayoutAllowlist(
+      const std::vector<std::string>& layouts) override;
 
   void set_ime_list(const std::vector<ComponentExtensionIME>& ime_list) {
     ime_list_ = ime_list;
   }
 
  private:
+  std::set<std::string> login_layout_set_;
   std::vector<ComponentExtensionIME> ime_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MockComponentExtensionIMEManagerDelegate);