Read container_instance_id.

chrome/browser/chromeos/arc/arc_session_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 194 matching lines @@
 
 void ArcSessionManager::OnSessionStopped(ArcStopReason reason,
                                          bool restarting) {
   if (restarting) {
     // If ARC is being restarted, here do nothing, and just wait for its
     // next run.
     VLOG(1) << "ARC session is stopped, but being restarted: " << reason;
     return;
   }
 
+  SetState(State::STOPPED);
+
   // TODO(crbug.com/625923): Use |reason| to report more detailed errors.
   if (arc_sign_in_timer_.IsRunning())
     OnProvisioningFinished(ProvisioningResult::ARC_STOPPED);
 
   for (auto& observer : observer_list_)
     observer.OnArcSessionStopped(reason);
 
-  // Transition to the ARC data remove state.
-  if (!profile_->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested)) {
-    // TODO(crbug.com/665316): This is the workaround for the bug.
-    // If it is not necessary to remove the data, MaybeStartArcDataRemoval()
-    // synchronously calls MaybeReenableArc(), which causes unexpected
-    // ARC session stop. (Please see the bug for details).
-    SetState(State::REMOVING_DATA_DIR);
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&ArcSessionManager::MaybeReenableArc,
-                              weak_ptr_factory_.GetWeakPtr()));
-    return;
-  }
-
   MaybeStartArcDataRemoval();
 }
 
 void ArcSessionManager::OnProvisioningFinished(ProvisioningResult result) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // If the Mojo message to notify finishing the provisioning is already sent
   // from the container, it will be processed even after requesting to stop the
   // container. Ignore all |result|s arriving while ARC is disabled, in order to
   // avoid popping up an error message triggered below. This code intentionally
@@ skipping 627 matching lines @@
   ShutdownSession();
   if (support_host_)
     support_host_->Close();
 }
 
 void ArcSessionManager::MaybeStartArcDataRemoval() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile_);
   // Data removal cannot run in parallel with ARC session.
   DCHECK(arc_session_runner_->IsStopped());
-
-  // TODO(hidehiko): DCHECK the previous state, when the state machine is
-  // fixed.
+  DCHECK_EQ(State::STOPPED, state_);
   SetState(State::REMOVING_DATA_DIR);
 
   // TODO(hidehiko): Extract the implementation of data removal, so that
   // shutdown can cancel the operation not to call OnArcDataRemoved callback.
   if (!profile_->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested)) {
     // ARC data removal is not requested. Just move to the next state.
     MaybeReenableArc();
     return;
   }
 
@@ skipping 154 matching lines @@
 
 #undef MAP_STATE
 
   // Some compilers report an error even if all values of an enum-class are
   // covered exhaustively in a switch statement.
   NOTREACHED() << "Invalid value " << static_cast<int>(state);
   return os;
 }
 
 }  // namespace arc