More graceful shutdown for ArcSession.

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 <iosfwd>
 #include <string>
 #include <vector>
@@ skipping 85 matching lines @@
   // Return 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.
   static bool GetAvailable(const base::CommandLine* command_line);
 
   // HandleStartup() should be called upon profile startup.  This will only
   // launch an instance if the instance is enabled.
   // This can only be called on the thread that this class was created on.
-  virtual void HandleStartup() = 0;
 
-  // Shutdown() should be called when the browser is shutting down. This can
-  // only be called on the thread that this class was created on.
-  virtual void Shutdown() = 0;
+  // Starts the ARC service, then it will connect the Mojo channel. When the
+  // bridge becomes ready, OnBridgeReady() is called.
+  virtual void RequestStart() = 0;
+
+  // Stops the ARC service.
+  virtual void RequestStop() = 0;
+
+  // OnShutdown() should be called when the browser is shutting down. This can
+  // only be called on the thread that this class was created on. We assume that
+  // when this function is called, MessageLoop is no longer exists.
+  virtual void OnShutdown() = 0;
 
   // Adds or removes observers. This can only be called on the thread that this
   // class was created on. RemoveObserver does nothing if |observer| is not in
   // the list.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   InstanceHolder<mojom::AppInstance>* app() { return &app_; }
   InstanceHolder<mojom::AudioInstance>* audio() { return &audio_; }
   InstanceHolder<mojom::AuthInstance>* auth() { return &auth_; }
@@ skipping 116 matching lines @@
   void SetStopReason(StopReason stop_reason);
 
   base::ObserverList<Observer>& observer_list() { return observer_list_; }
 
   bool CalledOnValidThread();
 
  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, StopMidStartup);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Restart);
   FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, OnBridgeStopped);
+  FRIEND_TEST_ALL_PREFIXES(ArcBridgeTest, Shutdown);
 
   base::ObserverList<Observer> observer_list_;
 
   base::ThreadChecker thread_checker_;
 
   // The current state of the bridge.
   ArcBridgeService::State state_;
 
   // The reason the bridge is stopped.
   StopReason stop_reason_;
 
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 // Defines "<<" operator for LOGging purpose.
 std::ostream& operator<<(
     std::ostream& os, ArcBridgeService::StopReason reason);
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_