Keep state even if AndroidManagement check returns MANAGED or ERROR.

chrome/browser/chromeos/arc/arc_session_manager.h

 // Copyright 2016 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 CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_
 
 #include <memory>
 #include <ostream>
 #include <string>
@@ skipping 218 matching lines @@
   // Negotiates the terms of service to user.
   void StartTermsOfServiceNegotiation();
   void OnTermsOfServiceNegotiated(bool accepted);
 
   // Returns whether ARC is managed and all ARC related OptIn preferences are
   // managed too.
   bool AreArcAllOptInPreferencesManaged() const;
 
   void SetState(State state);
   void ShutdownSession();
-  void OnAndroidManagementPassed();
   void OnArcDataRemoved(bool success);
   void OnArcSignInTimeout();
 
-  void StartArcAndroidManagementCheck();
-  void MaybeReenableArc();
+  // Starts Android management check. This is for first boot case (= Opt-in
+  // or OOBE flow case). In secondary or later ARC enabling, the check should
+  // run in background.
+  void StartAndroidManagementCheck();
 
   // Called when the Android management check is done in opt-in flow or
-  // re-auth flow.
+  // OOBE flow.
   void OnAndroidManagementChecked(
       policy::AndroidManagementClient::Result result);
 
+  // Starts Android management check in background (in parallel with starting
+  // ARC). This is for secondary or later ARC enabling.
+  // The reason running them in parallel is for performance. The secondary or
+  // later ARC enabling is typically on "logging into Chrome" for the user who
+  // already opted in to use Google Play Store. In such a case, network is
+  // typically not yet ready. Thus, if we block ARC boot, it delays several
+  // seconds, which is not very user friendly.
+  void StartBackgroundAndroidManagementCheck();
+
   // Called when the background Android management check is done. It is
   // triggered when the second or later ARC boot timing.
   void OnBackgroundAndroidManagementChecked(
       policy::AndroidManagementClient::Result result);
 
   // Requests to starts ARC instance. Also, update the internal state to
   // ACTIVE.
   void StartArc();
 
   // Requests to stop ARC instnace. This resets two persistent flags:
   // kArcSignedIn and kArcTermsAccepted, so that, in next enabling,
   // it is started from Terms of Service negotiation.
   // TODO(hidehiko): Introduce STOPPING state, and this function should
   // transition to it.
   void StopArc();
 
   // ArcSessionRunner::Observer:
   void OnSessionStopped(ArcStopReason reason, bool restarting) override;
 
+  // On ARC session stopped and/or data removal completion, this is called

[hidehiko, 2017/03/06 11:57:56]

Updated, just because I'm here.

+  // so that, if necessary, ARC session is restarted.
+  // TODO(hidehiko): This can be removed after the racy state machine
+  // is fixed.
+  void MaybeReenableArc();
+
   std::unique_ptr<ArcSessionRunner> arc_session_runner_;
 
   // Unowned pointer. Keeps current profile.
   Profile* profile_ = nullptr;
 
   // Whether ArcSessionManager is requested to enable (starting to run ARC
   // instance) or not.
   bool enable_requested_ = false;
 
   // Internal state machine. See also State enum class.
@@ skipping 23 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ArcSessionManager);
 };
 
 // Outputs the stringified |state| to |os|. This is only for logging purposes.
 std::ostream& operator<<(std::ostream& os,
                          const ArcSessionManager::State& state);
 
 }  // namespace arc
 
 #endif  // CHROME_BROWSER_CHROMEOS_ARC_ARC_SESSION_MANAGER_H_