2 files changed, 3 insertions, 24 deletions
diff --git a/chromium/components/arc/midis/arc_midis_bridge.cc b/chromium/components/arc/midis/arc_midis_bridge.cc
index 32bec549440..657fcc4e32b 100644
--- a/chromium/components/arc/midis/arc_midis_bridge.cc
+++ b/chromium/components/arc/midis/arc_midis_bridge.cc
@@ -49,26 +49,12 @@ ArcMidisBridge* ArcMidisBridge::GetForBrowserContext(
 
 ArcMidisBridge::ArcMidisBridge(content::BrowserContext* context,
                                ArcBridgeService* bridge_service)
-    : arc_bridge_service_(bridge_service), binding_(this), weak_factory_(this) {
-  arc_bridge_service_->midis()->AddObserver(this);
+    : arc_bridge_service_(bridge_service), weak_factory_(this) {
+  arc_bridge_service_->midis()->SetHost(this);
 }
 
 ArcMidisBridge::~ArcMidisBridge() {
-  arc_bridge_service_->midis()->RemoveObserver(this);
-}
-
-void ArcMidisBridge::OnInstanceReady() {
-  DVLOG(1) << "ArcMidisBridge::OnInstanceReady() called.";
-  mojom::MidisInstance* midis_instance =
-      ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service_->midis(), Init);
-  DCHECK(midis_instance);
-
-  DVLOG(1) << "Calling Init on the other side of MidisInstance.";
-  mojom::MidisHostPtr host_proxy;
-  binding_.Bind(mojo::MakeRequest(&host_proxy));
-  midis_instance->Init(std::move(host_proxy));
-  binding_.set_connection_error_handler(base::Bind(
-      &mojo::Binding<MidisHost>::Close, base::Unretained(&binding_)));
+  arc_bridge_service_->midis()->SetHost(nullptr);
 }
 
 void ArcMidisBridge::OnBootstrapMojoConnection(
diff --git a/chromium/components/arc/midis/arc_midis_bridge.h b/chromium/components/arc/midis/arc_midis_bridge.h
index b08d0fc5a08..21bbf23c662 100644
--- a/chromium/components/arc/midis/arc_midis_bridge.h
+++ b/chromium/components/arc/midis/arc_midis_bridge.h
@@ -11,9 +11,7 @@
 
 #include "base/macros.h"
 #include "components/arc/common/midis.mojom.h"
-#include "components/arc/instance_holder.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class BrowserContext;
@@ -24,7 +22,6 @@ namespace arc {
 class ArcBridgeService;
 
 class ArcMidisBridge : public KeyedService,
-                       public InstanceHolder<mojom::MidisInstance>::Observer,
                        public mojom::MidisHost {
  public:
   // Returns singleton instance for the given BrowserContext,
@@ -35,9 +32,6 @@ class ArcMidisBridge : public KeyedService,
                  ArcBridgeService* bridge_service);
   ~ArcMidisBridge() override;
 
-  // Overridden from InstanceHolder<mojom::MidisInstance>::Observer:
-  void OnInstanceReady() override;
-
   // Midis Mojo host interface
   void Connect(mojom::MidisServerRequest request,
                mojom::MidisClientPtr client_ptr) override;
@@ -48,7 +42,6 @@ class ArcMidisBridge : public KeyedService,
                                  bool result);
 
   ArcBridgeService* const arc_bridge_service_;  // Owned by ArcServiceManager.
-  mojo::Binding<mojom::MidisHost> binding_;
   mojom::MidisHostPtr midis_host_ptr_;
 
   // WeakPtrFactory to use for callbacks.