Revert "Convert InputEngineManager client to use BrowserInterfaceBroker"

This reverts commit 328e5c36.

Reason for revert: compile failed on https://ci.chromium.org/p/chrome/builders/ci/linux-chromeos-google-rel/10375?blamelist=1#blamelist-tab, https://ci.chromium.org/p/chrome/builders/ci/chromeos-eve-google-rel/3538 and https://ci.chromium.org/p/chrome/builders/ci/chromeos-betty-google-rel/16026?blamelist=1#blamelist-tab

Original change's description:
> Convert InputEngineManager client to use BrowserInterfaceBroker
> 
> This CL converts InputEngineManager mojom interface clients for
> extensions in chrome to use BrowserInterfaceBroker.
> 
> Bug: 936482
> Change-Id: Iecc57f2a8c15a9523f08e4ab49156273a2ba4677
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1952623
> Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
> Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
> Reviewed-by: Sam McNally <sammc@chromium.org>
> Reviewed-by: Ken Rockot <rockot@google.com>
> Cr-Commit-Position: refs/heads/master@{#723261}

TBR=rockot@google.com,sammc@chromium.org,oksamyt@chromium.org,myid.shin@igalia.com

Change-Id: I28cc7789bbedb8cb7dc9c46b60d6620105379ba2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 936482
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1959240Reviewed-by: Maggie Cai <mxcai@chromium.org>
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723266}

chrome/app/chrome_content_browser_overlay_manifest.cc

@@ -34,6 +34,7 @@
 #include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader.mojom.h"
 #include "chrome/browser/ui/webui/chromeos/machine_learning/machine_learning_internals_page_handler.mojom.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
+#include "chromeos/services/ime/public/mojom/input_engine.mojom.h"
 #include "chromeos/services/media_perception/public/mojom/media_perception.mojom.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
 #include "chromeos/services/network_config/public/mojom/constants.mojom.h"  // nogncheck
@@ -113,6 +114,7 @@ const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
                 chromeos::cellular_setup::mojom::CellularSetup,
                 chromeos::crostini_installer::mojom::PageHandlerFactory,
                 chromeos::crostini_upgrader::mojom::PageHandlerFactory,
+                chromeos::ime::mojom::InputEngineManager,
                 chromeos::machine_learning::mojom::PageHandler,
                 chromeos::media_perception::mojom::MediaPerception,
                 chromeos::multidevice_setup::mojom::MultiDeviceSetup,

chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/extensions/chrome_extensions_browser_interface_binders.h"
 
 #include "base/bind.h"
-#include "build/branding_buildflags.h"
 #include "chrome/browser/media/router/media_router_feature.h"       // nogncheck
 #include "chrome/browser/media/router/mojo/media_router_desktop.h"  // nogncheck
 #include "chrome/common/media_router/mojom/media_router.mojom.h"
@@ -15,34 +14,8 @@
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 
-#if defined(OS_CHROMEOS)
-#include "mojo/public/cpp/bindings/pending_receiver.h"
-
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-#include "chromeos/services/ime/public/mojom/input_engine.mojom.h"
-#include "ui/base/ime/chromeos/extension_ime_util.h"
-#include "ui/base/ime/chromeos/input_method_manager.h"
-#endif
-#endif
-
 namespace extensions {
 
-namespace {
-#if defined(OS_CHROMEOS)
-
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-// Resolves InputEngineManager receiver in InputMethodManager.
-void BindInputEngineManager(
-    content::RenderFrameHost* render_frame_host,
-    mojo::PendingReceiver<chromeos::ime::mojom::InputEngineManager> receiver) {
-  chromeos::input_method::InputMethodManager::Get()->ConnectInputEngineManager(
-      std::move(receiver));
-}
-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
-
-#endif
-}  // namespace
-
 void PopulateChromeFrameBindersForExtension(
     service_manager::BinderMapWithContext<content::RenderFrameHost*>*
         binder_map,
@@ -57,17 +30,6 @@ void PopulateChromeFrameBindersForExtension(
         base::BindRepeating(&media_router::MediaRouterDesktop::BindToReceiver,
                             base::RetainedRef(extension), context));
   }
-
-#if defined(OS_CHROMEOS)
-
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-  // Registry InputEngineManager for official Google XKB Input only.
-  if (extension->id() == chromeos::extension_ime_util::kXkbExtensionId) {
-    map->Add<chromeos::ime::mojom::InputEngineManager>(
-        base::BindRepeating(&BindInputEngineManager));
-  }
-#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
-#endif
 }
 
 }  // namespace extensions

chrome/browser/extensions/chrome_extensions_interface_registration.cc

@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
+#include "build/branding_buildflags.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_frame_host.h"
@@ -24,6 +25,7 @@
 #if defined(OS_CHROMEOS)
 #include "base/task/post_task.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/services/ime/public/mojom/input_engine.mojom.h"
 #include "chromeos/services/media_perception/public/mojom/media_perception.mojom.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/chromeos_camera/camera_app_helper_impl.h"
@@ -36,12 +38,24 @@
 #include "media/capture/video/chromeos/mojom/camera_app.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+#include "ui/base/ime/chromeos/extension_ime_util.h"
+#include "ui/base/ime/chromeos/input_method_manager.h"
 #endif
 
 namespace extensions {
 namespace {
 #if defined(OS_CHROMEOS)
 
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+// Resolves InputEngineManager request in InputMethodManager.
+void BindInputEngineManager(
+    chromeos::ime::mojom::InputEngineManagerRequest request,
+    content::RenderFrameHost* source) {
+  chromeos::input_method::InputMethodManager::Get()->ConnectInputEngineManager(
+      std::move(request));
+}
+#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+
 // Translates the renderer-side source ID to video device id.
 void TranslateVideoDeviceId(
     const std::string& salt,
@@ -126,6 +140,13 @@ void RegisterChromeInterfacesForExtension(
   DCHECK(extension);
 #if defined(OS_CHROMEOS)
 
+#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // Registry InputEngineManager for official Google XKB Input only.
+  if (extension->id() == chromeos::extension_ime_util::kXkbExtensionId) {
+    registry->AddInterface(base::BindRepeating(&BindInputEngineManager));
+  }
+#endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+
   if (extension->permissions_data()->HasAPIPermission(
           APIPermission::kMediaPerceptionPrivate)) {
     extensions::ExtensionsAPIClient* client =

chrome/renderer/resources/extensions/chromeos_ime_service_bindings.js

@@ -281,6 +281,6 @@ class ImeService {
 (function() {
   let ptr = new chromeos.ime.mojom.InputEngineManagerPtr;
   Mojo.bindInterface(chromeos.ime.mojom.InputEngineManager.name,
-                     mojo.makeRequest(ptr).handle, "context", true);
+                     mojo.makeRequest(ptr).handle);
   exports.$set('returnValue', new ImeService(ptr));
 })();