arc: Revamp the ArcBridgeService interface

components/arc/clipboard/arc_clipboard_bridge.cc

Index: components/arc/clipboard/arc_clipboard_bridge.cc
diff --git a/components/arc/clipboard/arc_clipboard_bridge.cc b/components/arc/clipboard/arc_clipboard_bridge.cc
index aa0dbe42cbc1a92d0ca4fbd42507ce5edf4c220d..7ac61f9e11dfb7ae498117096571d0b28b72b5a0 100644
--- a/components/arc/clipboard/arc_clipboard_bridge.cc
+++ b/components/arc/clipboard/arc_clipboard_bridge.cc
@@ -29,23 +29,17 @@ namespace arc {
 
 ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->clipboard()->AddObserver(this);
 }
 
 ArcClipboardBridge::~ArcClipboardBridge() {
   DCHECK(CalledOnValidThread());
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->clipboard()->RemoveObserver(this);
 }
 
-void ArcClipboardBridge::OnClipboardInstanceReady() {
-  mojom::ClipboardInstance* clipboard_instance =
-      arc_bridge_service()->clipboard_instance();
-  if (!clipboard_instance) {
-    LOG(ERROR) << "OnClipboardInstanceReady called, "
-               << "but no clipboard instance found";
-    return;
-  }
-
+void ArcClipboardBridge::OnInstanceReady(
+    mojom::ClipboardInstance* clipboard_instance,
+    uint32_t version) {
   clipboard_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
@@ -63,7 +57,7 @@ void ArcClipboardBridge::GetTextContent() {
   clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
 
   mojom::ClipboardInstance* clipboard_instance =
-      arc_bridge_service()->clipboard_instance();
+      arc_bridge_service()->clipboard()->instance();
   clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text));
 }