[ChromeOS] Make GaiaAutheFetcher parsing logic default to service_unavailable

chrome/common/net/gaia/gaia_auth_fetcher.cc

 // Copyright (c) 2010 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/common/net/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 35 matching lines @@
     "Session=%s";
 // static
 const char GaiaAuthFetcher::kGetUserInfoFormat[] =
     "LSID=%s";
 
 // static
 const char GaiaAuthFetcher::kAccountDeletedError[] = "AccountDeleted";
 // static
 const char GaiaAuthFetcher::kAccountDisabledError[] = "AccountDisabled";
 // static
+const char GaiaAuthFetcher::kBadAuthenticationError[] = "BadAuthentication";
+// static
 const char GaiaAuthFetcher::kCaptchaError[] = "CaptchaRequired";
 // static
 const char GaiaAuthFetcher::kServiceUnavailableError[] =
     "ServiceUnavailable";
 // static
 const char GaiaAuthFetcher::kErrorParam[] = "Error";
 // static
 const char GaiaAuthFetcher::kErrorUrlParam[] = "Url";
 // static
 const char GaiaAuthFetcher::kCaptchaUrlParam[] = "CaptchaUrl";
@@ skipping 271 matching lines @@
     if (error == kCaptchaError) {
       GURL image_url(kCaptchaUrlPrefix + captcha_url);
       GURL unlock_url(url);
       return GoogleServiceAuthError::FromCaptchaChallenge(
           captcha_token, image_url, unlock_url);
     }
     if (error == kAccountDeletedError)
       return GoogleServiceAuthError(GoogleServiceAuthError::ACCOUNT_DELETED);
     if (error == kAccountDisabledError)
       return GoogleServiceAuthError(GoogleServiceAuthError::ACCOUNT_DISABLED);
+    if (error == kBadAuthenticationError) {
+      return GoogleServiceAuthError(
+          GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
+    }
     if (error == kServiceUnavailableError) {
       return GoogleServiceAuthError(
           GoogleServiceAuthError::SERVICE_UNAVAILABLE);
     }
 
+    LOG(WARNING) << "Incomprehensible response from Google Accounts servers.";
     return GoogleServiceAuthError(
-        GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
+        GoogleServiceAuthError::SERVICE_UNAVAILABLE);

[John Gregg, 2010/12/01 00:58:15]

Neither one of these is natural as the default.  If we are going to change the
default now, perhaps it's an opportunity to add "UNKNOWN_ERROR".

[Chris Masone, 2010/12/01 16:51:26]

I dunno...it seems to me that what this means is we can't successfully talk to
the service, so SERVICE_UNAVAILABLE makes sense.  I don't know that using
UNKNOWN_ERROR would allow us to show a more useful error to the user in this
case.  I suppose we could add UNKNOWN_ERROR for logging purposes, or to allow
callers of this API to distinguish these cases, but conflate this error with
something like SERVICE_UNAVAILABLE for UI messaging purposes?

[John Gregg, 2010/12/02 19:02:16]

I was thinking SERVICE_UNAVAILABLE implies "try again later" where as this
incomprensible response means something is more seriously wrong, like we're
talking to a different version of the server.

But this is probably fine.

[Chris Masone, 2010/12/02 22:59:49]

We've seen this in a captive portal situation as well, so really... "try again
later" is the only thing the system can do in this case, kinda no matter what.

Given that, and the trybot run...how do you feel about the change?

   }
 
   NOTREACHED();
 }
 
 void GaiaAuthFetcher::OnClientLoginFetched(const std::string& data,
                                            const URLRequestStatus& status,
                                            int response_code) {
 
   if (status.is_success() && response_code == RC_REQUEST_OK) {
@@ skipping 64 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }