Revert r118627 and r118640 "Update Gaia URL."

chrome/browser/net/gaia/gaia_oauth_fetcher.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/net/gaia/gaia_oauth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "chrome/browser/net/browser_url_util.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/net/gaia/oauth_request_signer.h"
@@ skipping 655 matching lines @@
     OnOAuthGetAccessTokenFetched(data, status, response_code);
   } else if (url.spec() == gaia_urls->oauth_wrap_bridge_url()) {
     OnOAuthWrapBridgeFetched(data, status, response_code);
   } else if (url.spec() == gaia_urls->oauth_user_info_url()) {
     OnUserInfoFetched(data, status, response_code);
   } else if (StartsWithASCII(url.spec(),
                              gaia_urls->oauth_revoke_token_url(),
                              true)) {
     OnOAuthRevokeTokenFetched(data, status, response_code);
   } else {
-    // Invalid cookies cause Gaia to redirect to ServiceLogin. Check if
-    // this is the case and report failure properly.
-    std::string url_no_query = url.GetOrigin().spec() + url.path().substr(1);
-    std::string continue_url;
-    if (url_no_query == gaia_urls->service_login_url() &&
-        chrome_browser_net::GetValueForKeyInQuery(url, "continue",
-                                                  &continue_url)) {
-      LOG(ERROR) << "GaiaOAuthFetcher redirected to service login"
-                 << " , url=" << url.spec();
-
-      if (StartsWithASCII(continue_url,
-                          gaia_urls->get_oauth_token_url(),
-                          true)) {
-        consumer_->OnGetOAuthTokenFailure(GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else if (continue_url == gaia_urls->oauth1_login_url()) {
-        consumer_->OnOAuthLoginFailure(GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else if (continue_url == gaia_urls->oauth_get_access_token_url()) {
-        consumer_->OnOAuthGetAccessTokenFailure(GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else if (continue_url == gaia_urls->oauth_wrap_bridge_url()) {
-        consumer_->OnOAuthWrapBridgeFailure(service_scope_,
-            GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else if (continue_url == gaia_urls->oauth_user_info_url()) {
-        consumer_->OnUserInfoFailure(GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else if (StartsWithASCII(continue_url,
-                                 gaia_urls->oauth_revoke_token_url(),
-                                 true)) {
-        consumer_->OnOAuthRevokeTokenFailure(GoogleServiceAuthError(
-                GoogleServiceAuthError::SERVICE_UNAVAILABLE));
-      } else {
-        NOTREACHED();
-      }
-    } else {
-      NOTREACHED() << "GaiaOAuthFetcher unknown url=" << url.spec();
-    }
+    NOTREACHED();
   }
 }
 
 bool GaiaOAuthFetcher::ShouldAutoFetch(AutoFetchLimit fetch_step) {
   return fetch_step <= auto_fetch_limit_;
 }