arc-bridge: Restart ARC instance on crash

components/arc/arc_bridge_service_impl.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_IMPL_H_
 #define COMPONENTS_ARC_ARC_BRIDGE_SERVICE_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
   ~ArcBridgeServiceImpl() override;
 
   void DetectAvailability() override;
 
   void HandleStartup() override;
 
   void Shutdown() override;
 
  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);
 
   // If all pre-requisites are true (ARC is available, it has been enabled, and
   // the session has started), and ARC is stopped, start ARC. If ARC is running
   // and the pre-requisites stop being true, stop ARC.
   void PrerequisitesChanged();
 
   // Stops the running instance.
   void StopInstance();
 
   // ArcBridgeBootstrap::Delegate:
   void OnConnectionEstablished(ArcBridgeInstancePtr instance) override;
   void OnStopped() override;
 
   // DBus callbacks.
   void OnArcAvailable(bool available);
 
+  // Called when the bridge channel is closed. This typically only happens when
+  // the ARC instance crashes. This is not called during shutdown.
+  void OnChannelClosed();
+
   scoped_ptr<ArcBridgeBootstrap> bootstrap_;
 
   // Mojo endpoints.
   mojo::Binding<ArcBridgeHost> binding_;
   ArcBridgeInstancePtr instance_ptr_;
 
   // If the user's session has started.
   bool session_started_;
 
+  // If the instance had already been started but the connection to it was
+  // lost. This should make the instance restart.
+  bool reconnect_ = false;
+
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeServiceImpl);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_IMPL_H_