[Merge-M56] arc: Fix double provisioning failure reporting.

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::OnProvisioningFinished(ProvisioningResult result) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // 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
+    // no double message can happen in production.
+    LOG(WARNING) << " Provisioning result was already reported. Ignoring "
+                 << " additional result " << static_cast<int>(result) << ".";
+    return;
+  }
+  provisioning_reported_ = true;
+
   if (result == ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR) {
     // For backwards compatibility, use NETWORK_ERROR for
     // CHROME_SERVER_COMMUNICATION_ERROR case.
     UpdateOptInCancelUMA(OptInCancelReason::NETWORK_ERROR);
   } else if (!sign_in_time_.is_null()) {
     arc_sign_in_timer_.Stop();
 
     UpdateProvisioningTiming(base::Time::Now() - sign_in_time_,
                              result == ProvisioningResult::SUCCESS,
                              policy_util::IsAccountManaged(profile_));
@@ skipping 333 matching lines @@
   reenable_arc_ = true;
   StopArc();
 }
 
 void ArcAuthService::StartArc() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Arc must be started only if no pending data removal request exists.
   DCHECK(!profile_->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
 
+  provisioning_reported_ = false;
+
   arc_bridge_service()->RequestStart();
   SetState(State::ACTIVE);
 }
 
 void ArcAuthService::OnAuthCodeObtained(const std::string& auth_code) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!auth_code.empty());
 
   account_info_notifier_->Notify(!IsOptInVerificationDisabled(), auth_code,
                                  GetAccountType(),
@@ skipping 264 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