[Merge M56] arc: Fix situation when ARC cannot be disabled safely.

chrome/browser/chromeos/arc/arc_auth_service.cc

 // 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.
 
 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
@@ skipping 487 matching lines @@
 }
 
 void ArcAuthService::OnSignInFailed(mojom::ArcSignInFailureReason reason) {
   OnProvisioningFinished(
       ConvertArcSignInFailureReasonToProvisioningResult(reason));
 }
 
 void ArcAuthService::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
+  // does not support the case of reenabling.
+  if (!IsArcEnabled()) {
+    LOG(WARNING) << "Provisioning result received after Arc was disabled. "
+                 << "Ignoring result " << static_cast<int>(result) << ".";
+    return;
+  }
+
   // Due asynchronous nature of stopping Arc bridge, OnProvisioningFinished may
   // arrive after setting the |State::STOPPED| state and |State::Active| is not
   // guaranty set here. prefs::kArcDataRemoveRequested is also can be active
   // for now.
 
   if (provisioning_reported_) {
     // We don't expect ProvisioningResult::SUCCESS is reported twice or reported
     // after an error.
     DCHECK_NE(result, ProvisioningResult::SUCCESS);
     // TODO (khmel): Consider changing LOG to NOTREACHED once we guaranty that
@@ skipping 654 matching lines @@
       return os << "ACTIVE";
   }
 
   // Some compiler reports an error even if all values of an enum-class are
   // covered indivisually in a switch statement.
   NOTREACHED();
   return os;
 }
 
 }  // namespace arc