Refactor ArcBridgeServiceImpl part 2.

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>
 
-#include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-#include "base/values.h"
 #include "components/arc/arc_session_observer.h"
 #include "components/arc/instance_holder.h"
 
 namespace base {
 class CommandLine;
 }  // namespace base
 
 namespace arc {
 namespace mojom {
 
@@ skipping 98 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_; }
 
   // Gets if ARC is currently running.
-  bool ready() const { return state() == State::READY; }
+  bool ready() const { return state() == State::RUNNING; }
 
   // Gets if ARC is currently stopped. This is not exactly !ready() since there
   // are transient states between ready() and stopped().
   bool stopped() const { return state() == State::STOPPED; }
 
  protected:
   // The possible states of the bridge.  In the normal flow, the state changes
   // in the following sequence:
   //
   // STOPPED
-  //   PrerequisitesChanged() ->
-  // CONNECTING
-  //   OnConnectionEstablished() ->
+  //   RequestStart() ->
+  // STARTING
+  //   OnSessionReady() ->
   // READY
   //
   // The ArcSession state machine can be thought of being substates of
-  // ArcBridgeService's CONNECTING state.
+  // ArcBridgeService's STARTING state.
+  // ArcBridgeService's state machien can be stopped at any phase.

[Luis Héctor Chávez, 2016/12/16 23:20:12]

nit: s/machien/machine/

[hidehiko, 2016/12/19 08:05:11]

Done.

   //
   // *
-  //   StopInstance() ->
+  //   RequestStop() ->
   // STOPPING
-  //   OnStopped() ->
+  //   OnSessionStopped() ->
   // STOPPED
   enum class State {
-    // ARC is not currently running.
+    // ARC instance is not currently running.
     STOPPED,
 
-    // The request to connect has been sent.
-    CONNECTING,
+    // Request to start ARC instance is received. Startin an ARC instance.

[Luis Héctor Chávez, 2016/12/16 23:20:12]

nit: s/Startin/Starting/

[hidehiko, 2016/12/19 08:05:11]

Done.

+    STARTING,
 
-    // The instance has started, and the bridge is fully established.
-    CONNECTED,
+    // ARC instance has finished initializing, and is now ready for interaction
+    // with other services.
+    RUNNING,
 
-    // The ARC instance has finished initializing and is now ready for user
-    // interaction.
-    READY,
-
-    // The ARC instance has started shutting down.
+    // Request to stop ARC instance is recieved. Stopping the ARC instance.
     STOPPING,
   };
 
   // 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_;
@@ skipping 46 matching lines @@
 
   // WeakPtrFactory to use callbacks.
   base::WeakPtrFactory<ArcBridgeService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBridgeService);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_ARC_BRIDGE_SERVICE_H_