Merge 253627 "Properly handle failure modes in the wildcard logi..."

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 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/policy/user_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 31 matching lines @@
     "Enterprise.UserPolicyChromeOS.InitialFetch.DelayOAuth2Token";
 const char kUMAInitialFetchDelayPolicyFetch[] =
     "Enterprise.UserPolicyChromeOS.InitialFetch.DelayPolicyFetch";
 const char kUMAInitialFetchDelayTotal[] =
     "Enterprise.UserPolicyChromeOS.InitialFetch.DelayTotal";
 const char kUMAInitialFetchOAuth2Error[] =
     "Enterprise.UserPolicyChromeOS.InitialFetch.OAuth2Error";
 const char kUMAInitialFetchOAuth2NetworkError[] =
     "Enterprise.UserPolicyChromeOS.InitialFetch.OAuth2NetworkError";
 
-void OnWildcardCheckCompleted(const std::string& username, bool result) {
-  if (!result) {
+void OnWildcardCheckCompleted(const std::string& username,
+                              WildcardLoginChecker::Result result) {
+  if (result == WildcardLoginChecker::RESULT_BLOCKED) {
     LOG(ERROR) << "Online wildcard login check failed, terminating session.";
 
     // TODO(mnissler): This only removes the user pod from the login screen, but
     // the cryptohome remains. This is because deleting the cryptohome for a
     // logged-in session is not possible. Fix this either by delaying the
     // cryptohome deletion operation or by getting rid of the in-session
     // wildcard check.
     chromeos::UserManager::Get()->RemoveUserFromList(username);
     chrome::AttemptUserExit();
   }
@@ skipping 307 matching lines @@
     // OnComponentCloudPolicyUpdated() once it's ready.
     return;
   }
 
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state_,
                                 policy_prefs::kUserPolicyRefreshRate);
 }
 
 }  // namespace policy