Reland of arc: Use the new InstanceHolder for unittests

components/arc/arc_bridge_service.h

Index: components/arc/arc_bridge_service.h
diff --git a/components/arc/arc_bridge_service.h b/components/arc/arc_bridge_service.h
index 186800bc261a65ebe921f6f4ff0b3210f96ca529..456c3fa76768613cac92bdc03c71fa48c171c643 100644
--- a/components/arc/arc_bridge_service.h
+++ b/components/arc/arc_bridge_service.h
@@ -27,7 +27,7 @@ class ArcBridgeTest;
 // 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.
-class ArcBridgeService : public mojom::ArcBridgeHost {
+class ArcBridgeService {
  public:
   // Describes the reason the bridge is stopped.
   enum class StopReason {
@@ -57,7 +57,7 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
     virtual ~Observer() {}
   };
 
-  ~ArcBridgeService() override;
+  virtual ~ArcBridgeService();
 
   // Gets the global instance of the ARC Bridge Service. This can only be
   // called on the thread that this class was created on.
@@ -121,36 +121,6 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
     return &window_manager_;
   }
 
-  // ArcHost:
-  void OnAppInstanceReady(mojom::AppInstancePtr app_ptr) override;
-  void OnAudioInstanceReady(mojom::AudioInstancePtr audio_ptr) override;
-  void OnAuthInstanceReady(mojom::AuthInstancePtr auth_ptr) override;
-  void OnBluetoothInstanceReady(
-      mojom::BluetoothInstancePtr bluetooth_ptr) override;
-  void OnClipboardInstanceReady(
-      mojom::ClipboardInstancePtr clipboard_ptr) override;
-  void OnCrashCollectorInstanceReady(
-      mojom::CrashCollectorInstancePtr crash_collector_ptr) override;
-  void OnFileSystemInstanceReady(
-      mojom::FileSystemInstancePtr file_system_ptr) override;
-  void OnImeInstanceReady(mojom::ImeInstancePtr ime_ptr) override;
-  void OnIntentHelperInstanceReady(
-      mojom::IntentHelperInstancePtr intent_helper_ptr) override;
-  void OnMetricsInstanceReady(mojom::MetricsInstancePtr metrics_ptr) override;
-  void OnNetInstanceReady(mojom::NetInstancePtr net_ptr) override;
-  void OnNotificationsInstanceReady(
-      mojom::NotificationsInstancePtr notifications_ptr) override;
-  void OnObbMounterInstanceReady(
-      mojom::ObbMounterInstancePtr obb_mounter_ptr) override;
-  void OnPolicyInstanceReady(mojom::PolicyInstancePtr policy_ptr) override;
-  void OnPowerInstanceReady(mojom::PowerInstancePtr power_ptr) override;
-  void OnProcessInstanceReady(mojom::ProcessInstancePtr process_ptr) override;
-  void OnStorageManagerInstanceReady(
-      mojom::StorageManagerInstancePtr storage_manager_ptr) override;
-  void OnVideoInstanceReady(mojom::VideoInstancePtr video_ptr) override;
-  void OnWindowManagerInstanceReady(
-      mojom::WindowManagerInstancePtr window_manager_ptr) override;
-
   // Gets if ARC is available in this system.
   bool available() const { return available_; }
 
@@ -199,6 +169,27 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
 
   ArcBridgeService();
 
+  // Instance holders.
+  InstanceHolder<mojom::AppInstance> app_;
+  InstanceHolder<mojom::AudioInstance> audio_;
+  InstanceHolder<mojom::AuthInstance> auth_;
+  InstanceHolder<mojom::BluetoothInstance> bluetooth_;
+  InstanceHolder<mojom::ClipboardInstance> clipboard_;
+  InstanceHolder<mojom::CrashCollectorInstance> crash_collector_;
+  InstanceHolder<mojom::FileSystemInstance> file_system_;
+  InstanceHolder<mojom::ImeInstance> ime_;
+  InstanceHolder<mojom::IntentHelperInstance> intent_helper_;
+  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::ProcessInstance> process_;
+  InstanceHolder<mojom::StorageManagerInstance> storage_manager_;
+  InstanceHolder<mojom::VideoInstance> video_;
+  InstanceHolder<mojom::WindowManagerInstance> window_manager_;
+
   // Gets the current state of the bridge service.
   State state() const { return state_; }
 
@@ -217,9 +208,6 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
 
   bool CalledOnValidThread();
 
-  // Closes all Mojo channels.
-  void CloseAllChannels();
-
  private:
   friend class ArcBridgeTest;
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Basic);
@@ -228,27 +216,6 @@ class ArcBridgeService : public mojom::ArcBridgeHost {
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, OnBridgeStopped);
 
-  // Instance holders.
-  InstanceHolder<mojom::AppInstance> app_;
-  InstanceHolder<mojom::AudioInstance> audio_;
-  InstanceHolder<mojom::AuthInstance> auth_;
-  InstanceHolder<mojom::BluetoothInstance> bluetooth_;
-  InstanceHolder<mojom::ClipboardInstance> clipboard_;
-  InstanceHolder<mojom::CrashCollectorInstance> crash_collector_;
-  InstanceHolder<mojom::FileSystemInstance> file_system_;
-  InstanceHolder<mojom::ImeInstance> ime_;
-  InstanceHolder<mojom::IntentHelperInstance> intent_helper_;
-  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::ProcessInstance> process_;
-  InstanceHolder<mojom::StorageManagerInstance> storage_manager_;
-  InstanceHolder<mojom::VideoInstance> video_;
-  InstanceHolder<mojom::WindowManagerInstance> window_manager_;
-
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;