Fix ArcSessionManager state machine, part 2.

chrome/browser/chromeos/arc/arc_session_manager.h

Index: chrome/browser/chromeos/arc/arc_session_manager.h
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.h b/chrome/browser/chromeos/arc/arc_session_manager.h
index d5283fbd75554adedc906edc0dc2478b98a43025..96682f42ea077196439b783eb736fe4bb29bc0b2 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.h
+++ b/chrome/browser/chromeos/arc/arc_session_manager.h
@@ -167,6 +167,13 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   // If it is already requested to disable, no-op.
   void RequestDisable();
 
+  // Request to remove the ARC data.

[Yusuke Sato, 2017/03/06 21:39:59]

Requests

[hidehiko, 2017/03/07 18:51:02]

Done.

+  // If ARC is stopped, triggers to remove the data. Otherwise, queues to
+  // remove the data on ARC stopping.
+  // A log statement with the removal reason must be added prior to calling
+  // this.
+  void RequestArcDataRemoval();
+
   // Called from the Chrome OS metrics provider to record Arc.State
   // periodically.
   void RecordArcState();
@@ -184,11 +191,6 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   // This can be called only when ARC is running.
   void StopAndEnableArc();
 
-  // Removes the data if ARC is stopped. Otherwise, queue to remove the data
-  // on ARC is stopped. A log statement with the removal reason must be added
-  // prior to calling RemoveArcData().
-  void RemoveArcData();
-
   ArcSupportHost* support_host() { return support_host_.get(); }
 
   // TODO(hidehiko): Get rid of the getter by migration between ArcAuthContext
@@ -237,7 +239,6 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   void SetState(State state);
   void ShutdownSession();
   void OnAndroidManagementPassed();
-  void OnArcDataRemoved(bool success);
   void OnArcSignInTimeout();
 
   void StartArcAndroidManagementCheck();
@@ -267,6 +268,13 @@ class ArcSessionManager : public ArcSessionRunner::Observer,
   // ArcSessionRunner::Observer:
   void OnSessionStopped(ArcStopReason reason, bool restarting) override;
 
+  // Starts to remove ARC data, if it is requested via RequestArcDataRemoval().
+  // On completion, OnArcDataRemoved() is called.
+  // If not requested, OnArcDataRemoved() is called as if the data removal
+  // is done successfully, synchronously.
+  void StartArcDataRemoval();
+  void OnArcDataRemoved(bool success);
+
   std::unique_ptr<ArcSessionRunner> arc_session_runner_;
 
   // Unowned pointer. Keeps current profile.