arc: Fix double provisioning failure reporting.

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 "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
@@ skipping 228 matching lines @@
 
   // Restart ARC anyway. Let the enterprise reporting instance decide whether
   // the ARC user data wipe is still required or not.
   reenable_arc_ = false;
   VLOG(1) << "Reenable ARC";
   EnableArc();
 }
 
 void ArcSessionManager::OnProvisioningFinished(ProvisioningResult result) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  if (provisioning_reported_) {
+    // We don't expect ProvisioningResult::SUCCESS is reported twice or reported
+    // after an error.
+    DCHECK_NE(result, ProvisioningResult::SUCCESS);
+    LOG(WARNING) << " Provisioning result was already reported. Ignoring "

[hidehiko, 2016/12/06 18:50:01]

I'm ok with the current code for the short term fix, but OnProvisioningFinished
twice or more still sounds like unexpected situation, regardless of whether it
is an error or not.
Could you add TODO to make it NOTREACHED() once you fix the container?

[khmel, 2016/12/06 22:49:57]

Done.

+                 << " additional result " << static_cast<int>(result) << ".";
+    return;
+  }
+  provisioning_reported_ = true;
+
   DCHECK_EQ(state_, State::ACTIVE);
 
   if (result == ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR) {
     if (IsArcKioskMode()) {
       VLOG(1) << "Robot account auth code fetching error";
       // Log out the user. All the cleanup will be done in Shutdown() method.
       // The callback is not called because auth code is empty.
       chrome::AttemptUserExit();
       return;
     }
@@ skipping 325 matching lines @@
 // TODO(hidehiko): Remove this.
 void ArcSessionManager::StopAndEnableArc() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!arc_bridge_service()->stopped());
   reenable_arc_ = true;
   StopArc();
 }
 
 void ArcSessionManager::StartArc() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  provisioning_reported_ = false;
   arc_bridge_service()->RequestStart();
   SetState(State::ACTIVE);
 }
 
 void ArcSessionManager::OnArcSignInTimeout() {
   LOG(ERROR) << "Timed out waiting for first sign in.";
   OnProvisioningFinished(ProvisioningResult::OVERALL_SIGN_IN_TIMEOUT);
 }
 
 void ArcSessionManager::CancelAuthCode() {
@@ skipping 249 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