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

chrome/browser/chromeos/policy/wildcard_login_checker.cc

 // Copyright 2014 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/wildcard_login_checker.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 53 matching lines @@
 void WildcardLoginChecker::OnGetUserInfoSuccess(
     const base::DictionaryValue* response) {
   if (!start_timestamp_.is_null()) {
     base::Time now = base::Time::Now();
     UMA_HISTOGRAM_MEDIUM_TIMES(kUMADelayUserInfoFetch,
                                now - token_available_timestamp_);
     UMA_HISTOGRAM_MEDIUM_TIMES(kUMADelayTotal,
                                now - start_timestamp_);
   }
 
-  OnCheckCompleted(response->HasKey(kHostedDomainKey));
+  OnCheckCompleted(response->HasKey(kHostedDomainKey) ? RESULT_ALLOWED
+                                                      : RESULT_BLOCKED);
 }
 
 void WildcardLoginChecker::OnGetUserInfoFailure(
     const GoogleServiceAuthError& error) {
   LOG(ERROR) << "Failed to fetch user info " << error.ToString();
-  OnCheckCompleted(false);
+  OnCheckCompleted(RESULT_FAILED);
 }
 
 void WildcardLoginChecker::OnPolicyTokenFetched(
     const std::string& access_token,
     const GoogleServiceAuthError& error) {
   if (error.state() != GoogleServiceAuthError::NONE) {
     LOG(ERROR) << "Failed to fetch policy token " << error.ToString();
-    OnCheckCompleted(false);
+    OnCheckCompleted(RESULT_FAILED);
     return;
   }
 
   if (!start_timestamp_.is_null()) {
     token_available_timestamp_ = base::Time::Now();
     UMA_HISTOGRAM_MEDIUM_TIMES(kUMADelayPolicyTokenFetch,
                                token_available_timestamp_ - start_timestamp_);
   }
 
   token_fetcher_.reset();
   StartUserInfoFetcher(access_token);
 }
 
 void WildcardLoginChecker::StartUserInfoFetcher(
     const std::string& access_token) {
   user_info_fetcher_.reset(
       new UserInfoFetcher(this, g_browser_process->system_request_context()));
   user_info_fetcher_->Start(access_token);
 }
 
-void WildcardLoginChecker::OnCheckCompleted(bool result) {
+void WildcardLoginChecker::OnCheckCompleted(Result result) {
   if (!callback_.is_null())
     callback_.Run(result);
 }
 
 }  // namespace policy