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 176 matching lines @@
 // static
 bool ArcSessionManager::IsArcKioskMode() {
   return user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp();
 }
 
 void ArcSessionManager::OnBridgeStopped(ArcBridgeService::StopReason reason) {
   // TODO(crbug.com/625923): Use |reason| to report more detailed errors.
   if (arc_sign_in_timer_.IsRunning()) {
     OnProvisioningFinished(ProvisioningResult::ARC_STOPPED);
   }
+  provisioning_error_reported_ = false;

[Luis Héctor Chávez, 2016/12/06 17:35:20]

Is this one needed? Shouldn't we just use the one in StartArc()?

[khmel, 2016/12/06 17:46:55]

Actually not, more paranoiac...

 
   if (clear_required_) {
     // This should be always true, but just in case as this is looked at
     // inside RemoveArcData() at first.
     DCHECK(arc_bridge_service()->stopped());
     RemoveArcData();
   } else {
     // To support special "Stop and enable ARC" procedure for enterprise,
     // here call OnArcDataRemoved(true) as if the data removal is successfully
     // done.
@@ skipping 34 matching lines @@
   // 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);
   DCHECK_EQ(state_, State::ACTIVE);
 
+  if (result != ProvisioningResult::SUCCESS) {

[hidehiko, 2016/12/06 18:10:53]

Per offline discussion, we want to guarantee OnProvisioningFinished() exactly
once per ArcSession run.
So, could you make it so?
- Removing this if condition.
- s/provisioning_error_reported_/provisioining_finished_called_/ or something?
- at L254: I think as this is unexpected behavior, NOTREACHED() should be
better.

[khmel, 2016/12/06 18:13:35]

Per our discussion I thought that we want to have something like
ExactlyOneCallback. So check is needed here.

[hidehiko, 2016/12/06 18:15:54]

I meant, it is not needed to check if result is SUCCESS or not.
If this is called or not is still needed, as you said.

[khmel, 2016/12/06 18:41:13]

Got you! However LOG(WARNING) sounds better because this is actual case and we
really handle it. Also added check for SUCCESS

+    if (provisioning_error_reported_) {
+      LOG(WARNING) << " Provisioning error was already reported. Ignoring "
+                   << " additional error " << static_cast<int>(result) << ".";
+      return;
+    }
+    provisioning_error_reported_ = true;
+  }
+
   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;
     }
 
     // For backwards compatibility, use NETWORK_ERROR for
@@ skipping 323 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_error_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