arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc

Index: chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
diff --git a/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc b/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
index b2e9a8bed709c13fedeba4b641d59a54e9639311..9bec81a0c5172dff03ffec0c05e095cc13e568a4 100644
--- a/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
+++ b/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/arc/gpu_arc_video_service_host.h"
 
+#include <string>
+
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -60,17 +62,17 @@ class VideoAcceleratorFactoryService : public mojom::VideoAcceleratorFactory {
 GpuArcVideoServiceHost::GpuArcVideoServiceHost(
     arc::ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->video()->AddObserver(this);
 }
 
 GpuArcVideoServiceHost::~GpuArcVideoServiceHost() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->video()->RemoveObserver(this);
 }
 
-void GpuArcVideoServiceHost::OnVideoInstanceReady() {
+void GpuArcVideoServiceHost::OnInstanceReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  auto video_instance = arc_bridge_service()->video_instance();
+  auto video_instance = arc_bridge_service()->video()->instance();
   DCHECK(video_instance);
   video_instance->Init(binding_.CreateInterfacePtrAndBind());
 }