arc: Notify the user on fatal opt-in flow errors

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/shelf/shelf_delegate.h"
 #include "ash/shell.h"
@@ skipping 177 matching lines @@
 
   return true;
 }
 
 void ArcAuthService::OnAuthInstanceReady() {
   arc_bridge_service()->auth_instance()->Init(
       binding_.CreateInterfacePtrAndBind());
 }
 
 void ArcAuthService::OnBridgeStopped() {
+  if (waiting_for_reply_) {
+    // Using SERVICE_UNAVAILABLE instead of UNKNOWN_ERROR, since the latter
+    // causes this code to not try to stop ARC, so it would retry without the
+    // user noticing.
+    OnSignInFailed(arc::mojom::ArcSignInFailureReason::SERVICE_UNAVAILABLE);
+  }
   if (!clear_required_)
     return;
   clear_required_ = false;
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->RemoveArcData(
       cryptohome::Identification(
           multi_user_util::GetAccountIdFromProfile(profile_)));
 }
 
 std::string ArcAuthService::GetAndResetAuthCode() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
@@ skipping 22 matching lines @@
   initial_opt_in_ = false;
   auth_callback_ = callback;
   StartUI();
 }
 
 void ArcAuthService::OnSignInComplete() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK_EQ(state_, State::ACTIVE);
   DCHECK(!sign_in_time_.is_null());
 
+  waiting_for_reply_ = false;

[Luis Héctor Chávez, 2016/06/29 23:37:50]

If adding this flag is undesirable, all the places where I touch it,
|sign_in_time_| is also used and could be removed if I reset |sign_in_time_|
near the two places where I reset |waiting_for_reply_|.

I didn't want to conflate both, so I personally prefer to keep them separate.

+
   if (!IsOptInVerificationDisabled() &&
       !profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) {
     playstore_launcher_.reset(
         new ArcAppLauncher(profile_, kPlayStoreAppId, true));
   }
 
   profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, true);
   CloseUI();
   UpdateProvisioningTiming(base::Time::Now() - sign_in_time_, true,
                            IsAccountManaged(profile_));
   UpdateProvisioningResultUMA(ProvisioningResult::SUCCESS);
 }
 
 void ArcAuthService::OnSignInFailed(arc::mojom::ArcSignInFailureReason reason) {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK_EQ(state_, State::ACTIVE);
   DCHECK(!sign_in_time_.is_null());
 
+  waiting_for_reply_ = false;
+
   UpdateProvisioningTiming(base::Time::Now() - sign_in_time_, false,
                            IsAccountManaged(profile_));
   int error_message_id;
   switch (reason) {
     case arc::mojom::ArcSignInFailureReason::NETWORK_ERROR:
       error_message_id = IDS_ARC_SIGN_IN_NETWORK_ERROR;
       UpdateOptInCancelUMA(OptInCancelReason::NETWORK_ERROR);
       UpdateProvisioningResultUMA(ProvisioningResult::NETWORK_ERROR);
       break;
     case arc::mojom::ArcSignInFailureReason::SERVICE_UNAVAILABLE:
@@ skipping 289 matching lines @@
   if (state != State::FETCHING_CODE) {
     ShutdownBridgeAndCloseUI();
     return;
   }
 
   sign_in_time_ = base::Time::Now();
 
   SetUIPage(UIPage::START_PROGRESS, base::string16());
   ShutdownBridge();
   auth_code_ = auth_code;
+  waiting_for_reply_ = true;
   StartArc();
 }
 
 void ArcAuthService::StartLso() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
 
   // Update UMA only if error (with or without feedback) is currently shown.
   if (ui_page_ == UIPage::ERROR) {
     UpdateOptInActionUMA(OptInActionType::RETRY);
   } else if (ui_page_ == UIPage::ERROR_WITH_FEEDBACK) {
@@ skipping 141 matching lines @@
       return os << kStateFetchingCode;
     case ArcAuthService::State::ACTIVE:
       return os << kStateActive;
     default:
       NOTREACHED();
       return os;
   }
 }
 
 }  // namespace arc