Move ArcSessionRunner from ArcBridgeService to ArcSessionManager.

components/arc/arc_bridge_service.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 30 matching lines @@
 class PowerInstance;
 class PrintInstance;
 class ProcessInstance;
 class StorageManagerInstance;
 class TtsInstance;
 class VideoInstance;
 class WallpaperInstance;
 
 }  // namespace mojom
 
-class ArcSessionObserver;
-class ArcSessionRunner;
-
-// The Chrome-side service that handles ARC instances and ARC bridge creation.
-// This service handles the lifetime of ARC instances and sets up the
-// communication channel (the ARC bridge) used to send and receive messages.
+// Holds Mojo channels which proxy to ARC side implementation. The actual
+// instances are set/removed via ArcBridgeHostImpl.
 class ArcBridgeService {
  public:
   ArcBridgeService();
-  virtual ~ArcBridgeService();
+  ~ArcBridgeService();
 
-  // Return true if ARC has been enabled through a commandline
-  // switch.
+  // Returns true if ARC has been enabled through a commandline switch.
   static bool GetEnabled(const base::CommandLine* command_line);
 
-  // Return true if ARC is available on the current board.
+  // Returns true if ARC is available on the current board.
   static bool GetAvailable(const base::CommandLine* command_line);
 
-  // Initializes the ArcSessionRunner with the given instance.
-  // This must be called before following proxy methods.
-  void InitializeArcSessionRunner(
-      std::unique_ptr<ArcSessionRunner> arc_session_runner);
-
-  // Proxies the method to ArcSessionRunner. See details in the
-  // ArcSessionRunner's comment.
-  // TODO(hidehiko): Move the ownership from ArcBridgeService to
-  // ArcSessionManager, and remove these methods.
-  void AddObserver(ArcSessionObserver* observer);
-  void RemoveObserver(ArcSessionObserver* observer);
-  void RequestStart();
-  void RequestStop();
-  void OnShutdown();
-  bool ready() const;
-  bool stopped() const;
-
   InstanceHolder<mojom::AppInstance>* app() { return &app_; }
   InstanceHolder<mojom::AudioInstance>* audio() { return &audio_; }
   InstanceHolder<mojom::AuthInstance>* auth() { return &auth_; }
   InstanceHolder<mojom::BluetoothInstance>* bluetooth() { return &bluetooth_; }
   InstanceHolder<mojom::BootPhaseMonitorInstance>* boot_phase_monitor() {
     return &boot_phase_monitor_;
   }
   InstanceHolder<mojom::ClipboardInstance>* clipboard() { return &clipboard_; }
   InstanceHolder<mojom::CrashCollectorInstance>* crash_collector() {
     return &crash_collector_;
@@ skipping 22 matching lines @@
   InstanceHolder<mojom::PrintInstance>* print() { return &print_; }
   InstanceHolder<mojom::ProcessInstance>* process() { return &process_; }
   InstanceHolder<mojom::StorageManagerInstance>* storage_manager() {
     return &storage_manager_;
   }
   InstanceHolder<mojom::TtsInstance>* tts() { return &tts_; }
   InstanceHolder<mojom::VideoInstance>* video() { return &video_; }
   InstanceHolder<mojom::WallpaperInstance>* wallpaper() { return &wallpaper_; }
 
  private:
-  // Instance holders.
   InstanceHolder<mojom::AppInstance> app_;
   InstanceHolder<mojom::AudioInstance> audio_;
   InstanceHolder<mojom::AuthInstance> auth_;
   InstanceHolder<mojom::BluetoothInstance> bluetooth_;
   InstanceHolder<mojom::BootPhaseMonitorInstance> boot_phase_monitor_;
   InstanceHolder<mojom::ClipboardInstance> clipboard_;
   InstanceHolder<mojom::CrashCollectorInstance> crash_collector_;
   InstanceHolder<mojom::EnterpriseReportingInstance> enterprise_reporting_;
   InstanceHolder<mojom::FileSystemInstance> file_system_;
   InstanceHolder<mojom::ImeInstance> ime_;
   InstanceHolder<mojom::IntentHelperInstance> intent_helper_;
   InstanceHolder<mojom::KioskInstance> kiosk_;
   InstanceHolder<mojom::MetricsInstance> metrics_;
   InstanceHolder<mojom::NetInstance> net_;
   InstanceHolder<mojom::NotificationsInstance> notifications_;
   InstanceHolder<mojom::ObbMounterInstance> obb_mounter_;
   InstanceHolder<mojom::PolicyInstance> policy_;
   InstanceHolder<mojom::PowerInstance> power_;
   InstanceHolder<mojom::PrintInstance> print_;
   InstanceHolder<mojom::ProcessInstance> process_;
   InstanceHolder<mojom::StorageManagerInstance> storage_manager_;
   InstanceHolder<mojom::TtsInstance> tts_;
   InstanceHolder<mojom::VideoInstance> video_;
   InstanceHolder<mojom::WallpaperInstance> wallpaper_;
 
-  std::unique_ptr<ArcSessionRunner> arc_session_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_