Respect the new Online Wallet sign-in response.

components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc

 // Copyright 2013 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 "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using testing::_;
 
@@ skipping 79 matching lines @@
     fetcher->set_url(GURL(url));
     fetcher->set_status(net::URLRequestStatus());
     fetcher->set_response_code(response_code);
     fetcher->SetResponseString(response_string);
     fetcher->set_cookies(cookies);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void MockSuccessfulOAuthLoginResponse() {
     SetUpFetcherResponseAndCompleteRequest(
-        GaiaUrls::GetInstance()->client_login_url(), 200,
+        GaiaUrls::GetInstance()->client_login_url(), net::HTTP_OK,
         net::ResponseCookies(),
         "SID=sid\nLSID=lsid\nAuth=auth");
   }
 
   void MockFailedOAuthLoginResponse404() {
     SetUpFetcherResponseAndCompleteRequest(
         GaiaUrls::GetInstance()->client_login_url(),
-        404,
+        net::HTTP_NOT_FOUND,
         net::ResponseCookies(),
         std::string());
   }
 
   void MockSuccessfulGaiaUserInfoResponse(const std::string& username) {
     SetUpFetcherResponseAndCompleteRequest(
-        GaiaUrls::GetInstance()->get_user_info_url(), 200,
+        GaiaUrls::GetInstance()->get_user_info_url(), net::HTTP_OK,
         net::ResponseCookies(),
         "email=" + username);
   }
 
   void MockFailedGaiaUserInfoResponse404() {
     SetUpFetcherResponseAndCompleteRequest(
         GaiaUrls::GetInstance()->get_user_info_url(),
-        404,
+        net::HTTP_NOT_FOUND,
         net::ResponseCookies(),
         std::string());
   }
 
   void MockSuccessfulGetAccountInfoResponse(const std::string& username) {
     SetUpFetcherResponseAndCompleteRequest(
-        signin_helper_->GetGetAccountInfoUrlForTesting(), 200,
+        signin_helper_->GetGetAccountInfoUrlForTesting(), net::HTTP_OK,
         net::ResponseCookies(),
         base::StringPrintf(
             kGetAccountInfoValidResponseFormat,
             username.c_str()));
   }
 
   void MockFailedGetAccountInfoResponse404() {
     SetUpFetcherResponseAndCompleteRequest(
         signin_helper_->GetGetAccountInfoUrlForTesting(),
-        404,
+        net::HTTP_NOT_FOUND,
         net::ResponseCookies(),
         std::string());
   }
 
-  void MockSuccessfulPassiveAuthUrlMergeAndRedirectResponse() {
+  void MockSuccessfulPassiveSignInResponse() {
     SetUpFetcherResponseAndCompleteRequest(wallet::GetPassiveAuthUrl().spec(),
-                                           200,
+                                           net::HTTP_OK,
+                                           net::ResponseCookies(),
+                                           "YES");
+  }
+
+  void MockFailedPassiveSignInResponseNo() {
+    SetUpFetcherResponseAndCompleteRequest(wallet::GetPassiveAuthUrl().spec(),
+                                           net::HTTP_OK,
+                                           net::ResponseCookies(),
+                                           "NOOOOOOOOOOOOOOO");
+  }
+
+  void MockFailedPassiveSignInResponse404() {
+    SetUpFetcherResponseAndCompleteRequest(wallet::GetPassiveAuthUrl().spec(),
+                                           net::HTTP_NOT_FOUND,
                                            net::ResponseCookies(),
                                            std::string());
   }
-
-  void MockFailedPassiveAuthUrlMergeAndRedirectResponse404() {
-    SetUpFetcherResponseAndCompleteRequest(wallet::GetPassiveAuthUrl().spec(),
-                                           404,
-                                           net::ResponseCookies(),
-                                           std::string());
-  }
 
   WalletSigninHelperForTesting::State state() const {
     return signin_helper_->state();
   }
 
   scoped_ptr<WalletSigninHelperForTesting> signin_helper_;
   MockWalletSigninHelperDelegate mock_delegate_;
 
  private:
   // The profile's request context must be released on the IO thread.
   content::TestBrowserThread io_thread_;
   net::TestURLFetcherFactory factory_;
   TestingProfile profile_;
 };
 
 TEST_F(WalletSigninHelperTest, PassiveSigninSuccessful) {
   EXPECT_CALL(mock_delegate_, OnPassiveSigninSuccess("user@gmail.com"));
   signin_helper_->StartPassiveSignin();
-  MockSuccessfulPassiveAuthUrlMergeAndRedirectResponse();
+  MockSuccessfulPassiveSignInResponse();
   MockSuccessfulGetAccountInfoResponse("user@gmail.com");
 }
 
-TEST_F(WalletSigninHelperTest, PassiveSigninFailedSignin) {
+TEST_F(WalletSigninHelperTest, PassiveSigninFailedSignin404) {
   EXPECT_CALL(mock_delegate_, OnPassiveSigninFailure(_));
   signin_helper_->StartPassiveSignin();
-  MockFailedPassiveAuthUrlMergeAndRedirectResponse404();
+  MockFailedPassiveSignInResponse404();
+}
+
+TEST_F(WalletSigninHelperTest, PassiveSigninFailedSigninNo) {
+  EXPECT_CALL(mock_delegate_, OnPassiveSigninFailure(_));
+  signin_helper_->StartPassiveSignin();
+  MockFailedPassiveSignInResponseNo();
 }
 
 TEST_F(WalletSigninHelperTest, PassiveSigninFailedUserInfo) {
   EXPECT_CALL(mock_delegate_, OnPassiveSigninFailure(_));
   signin_helper_->StartPassiveSignin();
-  MockSuccessfulPassiveAuthUrlMergeAndRedirectResponse();
+  MockSuccessfulPassiveSignInResponse();
   MockFailedGetAccountInfoResponse404();
 }
 
 TEST_F(WalletSigninHelperTest, PassiveUserInfoSuccessful) {
   EXPECT_CALL(mock_delegate_, OnUserNameFetchSuccess("user@gmail.com"));
   signin_helper_->StartUserNameFetch();
   MockSuccessfulGetAccountInfoResponse("user@gmail.com");
 }
 
 TEST_F(WalletSigninHelperTest, PassiveUserInfoFailedUserInfo) {
   EXPECT_CALL(mock_delegate_, OnUserNameFetchFailure(_));
   signin_helper_->StartUserNameFetch();
   MockFailedGetAccountInfoResponse404();
 }
 
 TEST_F(WalletSigninHelperTest, AutomaticSigninSuccessful) {
   EXPECT_CALL(mock_delegate_, OnAutomaticSigninSuccess("user@gmail.com"));
   signin_helper_->StartAutomaticSignin("123SID", "123LSID");
   MockSuccessfulGaiaUserInfoResponse("user@gmail.com");
   MockSuccessfulOAuthLoginResponse();
-  MockSuccessfulPassiveAuthUrlMergeAndRedirectResponse();
+  MockSuccessfulPassiveSignInResponse();
 }
 
 TEST_F(WalletSigninHelperTest, AutomaticSigninFailedGetUserInfo) {
   EXPECT_CALL(mock_delegate_, OnAutomaticSigninFailure(_));
   signin_helper_->StartAutomaticSignin("123SID", "123LSID");
   MockFailedGaiaUserInfoResponse404();
 }
 
 TEST_F(WalletSigninHelperTest, AutomaticSigninFailedOAuthLogin) {
   EXPECT_CALL(mock_delegate_, OnAutomaticSigninFailure(_));
   signin_helper_->StartAutomaticSignin("123SID", "123LSID");
   MockSuccessfulGaiaUserInfoResponse("user@gmail.com");
   MockFailedOAuthLoginResponse404();
 }
 
-TEST_F(WalletSigninHelperTest, AutomaticSigninFailedSignin) {
+TEST_F(WalletSigninHelperTest, AutomaticSigninFailedSignin404) {
   EXPECT_CALL(mock_delegate_, OnAutomaticSigninFailure(_));
   signin_helper_->StartAutomaticSignin("123SID", "123LSID");
   MockSuccessfulGaiaUserInfoResponse("user@gmail.com");
   MockSuccessfulOAuthLoginResponse();
-  MockFailedPassiveAuthUrlMergeAndRedirectResponse404();
+  MockFailedPassiveSignInResponse404();
+}
+
+TEST_F(WalletSigninHelperTest, AutomaticSigninFailedSigninNo) {
+  EXPECT_CALL(mock_delegate_, OnAutomaticSigninFailure(_));
+  signin_helper_->StartAutomaticSignin("123SID", "123LSID");
+  MockSuccessfulGaiaUserInfoResponse("user@gmail.com");
+  MockSuccessfulOAuthLoginResponse();
+  MockFailedPassiveSignInResponseNo();
 }
 
 // TODO(aruslan): http://crbug.com/188317 Need more tests.
 
 }  // namespace wallet
 }  // namespace autofill