arc-bridge: Restart ARC instance on crash

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 <string>
 #include <vector>
 
@@ skipping 55 matching lines @@
 
   // Notifies life cycle events of ArcBridgeService.
   class Observer {
    public:
     // Called whenever the state of the bridge has changed.
     virtual void OnStateChanged(State state) {}
 
     // Called whenever ARC's availability has changed for this system.
     virtual void OnAvailableChanged(bool available) {}
 
-    // Called whenever the ARC app list is ready.
+    // Called whenever the ARC app interface state changes.
     virtual void OnAppInstanceReady() {}
+    virtual void OnAppInstanceClosed() {}
 
-    // Called whenever the ARC input is ready.
+    // Called whenever the ARC input interface state changes.
     virtual void OnInputInstanceReady() {}
+    virtual void OnInputInstanceClosed() {}
 
-    // Called whenever the ARC notification is ready.
+    // Called whenever the ARC notification interface state changes.
     virtual void OnNotificationsInstanceReady() {}
+    virtual void OnNotificationsInstanceClosed() {}
 
-    // Called whenever the ARC power is ready.
+    // Called whenever the ARC power interface state changes.
     virtual void OnPowerInstanceReady() {}
+    virtual void OnPowerInstanceClosed() {}
 
-    // Called whenever the ARC process is ready.
+    // Called whenever the ARC process interface state changes.
     virtual void OnProcessInstanceReady() {}
+    virtual void OnProcessInstanceClosed() {}
 
-    // Called whenever the ARC settings is ready.
+    // Called whenever the ARC settings interface state changes.
     virtual void OnSettingsInstanceReady() {}
+    virtual void OnSettingsInstanceClosed() {}
 
    protected:
     virtual ~Observer() {}
   };
 
   ~ArcBridgeService() override;
 
   // Gets the global instance of the ARC Bridge Service. This can only be
   // called on the thread that this class was created on.
   static ArcBridgeService* Get();
@@ skipping 55 matching lines @@
   // Changes the current state and notifies all observers.
   void SetState(State state);
 
   // Changes the current availability and notifies all observers.
   void SetAvailable(bool availability);
 
   base::ObserverList<Observer>& observer_list() { return observer_list_; }
 
   bool CalledOnValidThread();
 
+  // Closes all Mojo channels.
+  void CloseAllChannels();
+
  private:
   friend class ArcBridgeTest;
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Basic);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Prerequisites);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, ShutdownMidStartup);
+  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
+
+  // Called when one of the individual channels is closed.
+  void OnAppChannelClosed();
+  void OnInputChannelClosed();
+  void OnNotificationsChannelClosed();
+  void OnPowerChannelClosed();
+  void OnProcessChannelClosed();
+  void OnSettingsChannelClosed();
 
   // Mojo interfaces.
   AppInstancePtr app_ptr_;
   InputInstancePtr input_ptr_;
   NotificationsInstancePtr notifications_ptr_;
   PowerInstancePtr power_ptr_;
   ProcessInstancePtr process_ptr_;
   SettingsInstancePtr settings_ptr_;
 
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;
 
   // If the ARC instance service is available.
   bool available_;
 
   // The current state of the bridge.
   ArcBridgeService::State state_;
 
+  // WeakPtrFactory to use callbacks.
+  base::WeakPtrFactory<ArcBridgeService> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_