Show different error message if ARC is disabled.

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 "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/auth/arc_active_directory_enrollment_token_fetcher.h"
-#include "chrome/browser/chromeos/arc/auth/arc_auth_info_fetcher.h"
 #include "chrome/browser/chromeos/arc/auth/arc_background_auth_code_fetcher.h"
 #include "chrome/browser/chromeos/arc/auth/arc_manual_auth_code_fetcher.h"
 #include "chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher.h"
 #include "chrome/browser/chromeos/arc/policy/arc_policy_util.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_features.h"
 #include "components/arc/arc_util.h"
@@ skipping 257 matching lines @@
     // IsArcKioskMode() is true. Both cases are handled above.
     fetcher_ = base::MakeUnique<ArcManualAuthCodeFetcher>(
         ArcSessionManager::Get()->auth_context(),
         ArcSessionManager::Get()->support_host());
   }
   fetcher_->Fetch(base::Bind(&ArcAuthService::OnAuthCodeFetched,
                              weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcAuthService::OnEnrollmentTokenFetched(
+    ArcAuthInfoFetcher::Status status,
     const std::string& enrollment_token) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   fetcher_.reset();
 
-  if (enrollment_token.empty()) {
+  switch (status) {
+    case ArcAuthInfoFetcher::Status::SUCCESS:
+      notifier_->Notify(true /*is_enforced*/, enrollment_token,
+                        mojom::ChromeAccountType::ACTIVE_DIRECTORY_ACCOUNT,
+                        true);
+      notifier_.reset();
+      return;
+    case ArcAuthInfoFetcher::Status::FAILURE:
+      ArcSessionManager::Get()->OnProvisioningFinished(
+          ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR);
+      return;
+    case ArcAuthInfoFetcher::Status::ARC_DISABLED:
+      ArcSessionManager::Get()->OnProvisioningFinished(
+          ProvisioningResult::ARC_DISABLED);
+      return;
+  }
+}
+
+void ArcAuthService::OnAuthCodeFetched(ArcAuthInfoFetcher::Status status,
+                                       const std::string& auth_code) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  fetcher_.reset();
+
+  if (status != ArcAuthInfoFetcher::Status::SUCCESS) {
     ArcSessionManager::Get()->OnProvisioningFinished(
         ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR);
     return;
-  }
-
-  notifier_->Notify(true /*is_enforced*/, enrollment_token,
-                    mojom::ChromeAccountType::ACTIVE_DIRECTORY_ACCOUNT, true);
-  notifier_.reset();
-}
-
-void ArcAuthService::OnAuthCodeFetched(const std::string& auth_code) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  fetcher_.reset();
-
-  if (auth_code.empty()) {
-    ArcSessionManager::Get()->OnProvisioningFinished(
-        ProvisioningResult::CHROME_SERVER_COMMUNICATION_ERROR);
-    return;
   }
 
   notifier_->Notify(
       !IsArcOptInVerificationDisabled(), auth_code, GetAccountType(),
       policy_util::IsAccountManaged(ArcSessionManager::Get()->profile()));
   notifier_.reset();
 }
 
 }  // namespace arc