Merge 68104 - [ChromeOS] Make GaiaAutheFetcher parsing logic default to servi...

chrome/common/net/gaia/gaia_auth_fetcher.cc

Index: chrome/common/net/gaia/gaia_auth_fetcher.cc
===================================================================
--- chrome/common/net/gaia/gaia_auth_fetcher.cc	(revision 68762)
+++ chrome/common/net/gaia/gaia_auth_fetcher.cc	(working copy)
@@ -53,6 +53,8 @@
 // static
 const char GaiaAuthFetcher::kAccountDisabledError[] = "AccountDisabled";
 // static
+const char GaiaAuthFetcher::kBadAuthenticationError[] = "BadAuthentication";
+// static
 const char GaiaAuthFetcher::kCaptchaError[] = "CaptchaRequired";
 // static
 const char GaiaAuthFetcher::kServiceUnavailableError[] =
@@ -344,13 +346,18 @@
       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);
   }
 
   NOTREACHED();