Reverted 136345 - Ran into GAIA dosserver issues in prod for http://accounts.google.com. We are goi…

chrome/browser/chromeos/login/online_attempt_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_library_loader.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/mock_auth_attempt_state_resolver.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/online_attempt.h"
 #include "chrome/browser/chromeos/login/test_attempt_state.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::BrowserThread;
 using ::testing::AnyNumber;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::_;
-using content::BrowserThread;
 
 namespace chromeos {
 
 class OnlineAttemptTest : public testing::Test {
  public:
   OnlineAttemptTest()
       : message_loop_(MessageLoop::TYPE_UI),
         ui_thread_(BrowserThread::UI, &message_loop_),
         state_("", "", "", "", "", false),
         resolver_(new MockAuthAttemptStateResolver) {
@@ skipping 201 matching lines @@
 
 TEST_F(OnlineAttemptTest, LoginServiceUnavailable) {
   RunFailureTest(
       GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_UNAVAILABLE));
 }
 
 TEST_F(OnlineAttemptTest, CaptchaErrorOutputted) {
   GoogleServiceAuthError auth_error =
       GoogleServiceAuthError::FromClientLoginCaptchaChallenge(
           "CCTOKEN",
-          GURL("http://accounts.google.com/Captcha?ctoken=CCTOKEN"),
+          GURL("http://www.google.com/accounts/Captcha?ctoken=CCTOKEN"),
           GURL("http://www.google.com/login/captcha"));
   RunFailureTest(auth_error);
 }
 
 TEST_F(OnlineAttemptTest, TwoFactorSuccess) {
   EXPECT_CALL(*(resolver_.get()), Resolve())
       .Times(1)
       .RetiresOnSaturation();
   GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&OnlineAttempt::OnClientLoginFailure,
                  attempt_->weak_factory_.GetWeakPtr(),
                  error));
 
   // Force UI thread to finish tasks so I can verify |state_|.
   message_loop_.RunAllPending();
   EXPECT_TRUE(GoogleServiceAuthError::None() ==
               state_.online_outcome().error());
 }
 
 }  // namespace chromeos