arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/arc/common/video_accelerator.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/gpu_service_registry.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ skipping 36 matching lines @@
 
  private:
   mojo::StrongBinding<VideoAcceleratorFactory> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoAcceleratorFactoryService);
 };
 
 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(
+    mojom::VideoInstance* video_instance,
+    uint32_t version) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  auto video_instance = arc_bridge_service()->video_instance();
   DCHECK(video_instance);
   video_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
 void GpuArcVideoServiceHost::DeprecatedOnRequestArcVideoAcceleratorChannel(
     const DeprecatedOnRequestArcVideoAcceleratorChannelCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Hardcode pid 0 since it is unused in mojo.
   const base::ProcessHandle kUnusedChildProcessHandle =
@@ skipping 65 matching lines @@
   callback.Run(std::move(child_handle), token);
 
   // The lifetime is managed by the StrongBinding insides the
   // VideoAcceleratorFactoryService.
   new VideoAcceleratorFactoryService(
       mojo::MakeRequest<::arc::mojom::VideoAcceleratorFactory>(
           std::move(server_pipe)));
 }
 
 }  // namespace arc