Revert 111270 - Part 1 of work to do user sign in based on OAuth2:

chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc

 // 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.
 //
 // A complete set of unit tests for GaiaAuthFetcher.
 // Originally ported from GoogleAuthenticator tests.
 
 #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
 
 #include <string>
@@ skipping 10 matching lines @@
 #include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 
-namespace {
-static const char kGetAuthCodeValidCookie[] =
-    "oauth_code=test-code; Path=/test; Secure; HttpOnly";
-static const char kGetAuthCodeCookieNoSecure[] =
-    "oauth_code=test-code; Path=/test; HttpOnly";
-static const char kGetAuthCodeCookieNoHttpOnly[] =
-    "oauth_code=test-code; Path=/test; Secure";
-static const char kGetAuthCodeCookieNoOAuthCode[] =
-    "Path=/test; Secure; HttpOnly";
-static const char kGetTokenPairValidResponse[] =
-    "{"
-    "  \"refresh_token\": \"rt1\","
-    "  \"access_token\": \"at1\","
-    "  \"expires_in\": 3600,"
-    "  \"token_type\": \"Bearer\""
-    "}";
-static const char kGetTokenPairResponseNoRefreshToken[] =
-    "{"
-    "  \"access_token\": \"at1\","
-    "  \"expires_in\": 3600,"
-    "  \"token_type\": \"Bearer\""
-    "}";
-static const char kGetTokenPairResponseNoAccessToken[] =
-    "{"
-    "  \"refresh_token\": \"rt1\","
-    "  \"expires_in\": 3600,"
-    "  \"token_type\": \"Bearer\""
-    "}";
-static const char kGetTokenPairResponseNoExpiresIn[] =
-    "{"
-    "  \"refresh_token\": \"rt1\","
-    "  \"access_token\": \"at1\","
-    "  \"token_type\": \"Bearer\""
-    "}";
-}  // namespace
-
 MockFetcher::MockFetcher(bool success,
                          const GURL& url,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
                          content::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
   net::URLRequestStatus::Status code;
   
   if (success) {
@@ skipping 28 matching lines @@
 void MockFetcher::Start() {
   delegate()->OnURLFetchComplete(this);
 }
 
 class GaiaAuthFetcherTest : public testing::Test {
  public:
   GaiaAuthFetcherTest()
       : client_login_source_(GaiaUrls::GetInstance()->client_login_url()),
         issue_auth_token_source_(
             GaiaUrls::GetInstance()->issue_auth_token_url()),
-        client_login_to_oauth2_source_(
-            GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
-        oauth2_token_source_(GaiaUrls::GetInstance()->oauth2_token_url()),
         token_auth_source_(GaiaUrls::GetInstance()->token_auth_url()),
         merge_session_source_(GaiaUrls::GetInstance()->merge_session_url()) {}
 
   void RunParsingTest(const std::string& data,
                       const std::string& sid,
                       const std::string& lsid,
                       const std::string& token) {
     std::string out_sid;
     std::string out_lsid;
     std::string out_token;
@@ skipping 24 matching lines @@
                                                 &out_captcha_token);
     EXPECT_EQ(error, out_error);
     EXPECT_EQ(error_url, out_error_url);
     EXPECT_EQ(captcha_url, out_captcha_url);
     EXPECT_EQ(captcha_token, out_captcha_token);
   }
 
   net::ResponseCookies cookies_;
   GURL client_login_source_;
   GURL issue_auth_token_source_;
-  GURL client_login_to_oauth2_source_;
-  GURL oauth2_token_source_;
   GURL token_auth_source_;
   GURL merge_session_source_;
   TestingProfile profile_;
  protected:
   MessageLoop message_loop_;
 };
 
 class MockGaiaConsumer : public GaiaAuthConsumer {
  public:
   MockGaiaConsumer() {}
   ~MockGaiaConsumer() {}
 
   MOCK_METHOD1(OnClientLoginSuccess, void(const ClientLoginResult& result));
   MOCK_METHOD2(OnIssueAuthTokenSuccess, void(const std::string& service,
       const std::string& token));
-  MOCK_METHOD3(OnOAuthLoginTokenSuccess,
-      void(const std::string& refresh_token,
-           const std::string& access_token,
-           int expires_in_secs));
   MOCK_METHOD1(OnTokenAuthSuccess, void(const std::string& data));
   MOCK_METHOD1(OnMergeSessionSuccess, void(const std::string& data));
   MOCK_METHOD1(OnClientLoginFailure,
       void(const GoogleServiceAuthError& error));
   MOCK_METHOD2(OnIssueAuthTokenFailure, void(const std::string& service,
       const GoogleServiceAuthError& error));
-  MOCK_METHOD1(OnOAuthLoginTokenFailure,
-      void(const GoogleServiceAuthError& error));
   MOCK_METHOD1(OnTokenAuthFailure, void(const GoogleServiceAuthError& error));
   MOCK_METHOD1(OnMergeSessionFailure, void(
       const GoogleServiceAuthError& error));
 };
 
 TEST_F(GaiaAuthFetcherTest, ErrorComparator) {
   GoogleServiceAuthError expected_error =
       GoogleServiceAuthError::FromConnectionError(-101);
 
   GoogleServiceAuthError matching_error =
@@ skipping 362 matching lines @@
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       RC_FORBIDDEN, cookies_, "", content::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
-TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenSuccess) {
-  MockGaiaConsumer consumer;
-  EXPECT_CALL(consumer, OnOAuthLoginTokenSuccess("rt1", "at1", 3600))
-      .Times(1);
-
-  TestingProfile profile;
-
-  TestURLFetcherFactory factory;
-  GaiaAuthFetcher auth(&consumer, std::string(),
-                       profile_.GetRequestContext());
-  auth.StartOAuthLoginTokenFetch("lso_token");
-
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeValidCookie);
-  EXPECT_TRUE(auth.HasPendingFetch());
-  MockFetcher mock_fetcher1(
-      client_login_to_oauth2_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      RC_REQUEST_OK, cookies, "",
-      content::URLFetcher::POST, &auth);
-  auth.OnURLFetchComplete(&mock_fetcher1);
-  EXPECT_TRUE(auth.HasPendingFetch());
-  MockFetcher mock_fetcher2(
-      oauth2_token_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      RC_REQUEST_OK, cookies_, kGetTokenPairValidResponse,
-      content::URLFetcher::POST, &auth);
-  auth.OnURLFetchComplete(&mock_fetcher2);
-  EXPECT_FALSE(auth.HasPendingFetch());
-}
-
-TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenClientLoginToOAuth2Failure) {
-  MockGaiaConsumer consumer;
-  EXPECT_CALL(consumer, OnOAuthLoginTokenFailure(_))
-      .Times(1);
-
-  TestingProfile profile;
-
-  TestURLFetcherFactory factory;
-  GaiaAuthFetcher auth(&consumer, std::string(),
-                       profile_.GetRequestContext());
-  auth.StartOAuthLoginTokenFetch("lso_token");
-
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeCookieNoSecure);
-  EXPECT_TRUE(auth.HasPendingFetch());
-  MockFetcher mock_fetcher(
-      client_login_to_oauth2_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      RC_REQUEST_OK, cookies, "",
-      content::URLFetcher::POST, &auth);
-  auth.OnURLFetchComplete(&mock_fetcher);
-  EXPECT_FALSE(auth.HasPendingFetch());
-}
-
-TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenOAuth2TokenPairFailure) {
-  MockGaiaConsumer consumer;
-  EXPECT_CALL(consumer, OnOAuthLoginTokenFailure(_))
-      .Times(1);
-
-  TestingProfile profile;
-
-  TestURLFetcherFactory factory;
-  GaiaAuthFetcher auth(&consumer, std::string(),
-                       profile_.GetRequestContext());
-  auth.StartOAuthLoginTokenFetch("lso_token");
-
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeValidCookie);
-  EXPECT_TRUE(auth.HasPendingFetch());
-  MockFetcher mock_fetcher1(
-      client_login_to_oauth2_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      RC_REQUEST_OK, cookies, "",
-      content::URLFetcher::POST, &auth);
-  auth.OnURLFetchComplete(&mock_fetcher1);
-  EXPECT_TRUE(auth.HasPendingFetch());
-  MockFetcher mock_fetcher2(
-      oauth2_token_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      RC_REQUEST_OK, cookies_, kGetTokenPairResponseNoRefreshToken,
-      content::URLFetcher::POST, &auth);
-  auth.OnURLFetchComplete(&mock_fetcher2);
-  EXPECT_FALSE(auth.HasPendingFetch());
-}
-
 TEST_F(GaiaAuthFetcherTest, TokenAuthSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnTokenAuthSuccess("<html></html>"))
       .Times(1);
 
   TestingProfile profile;
   TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
@@ skipping 96 matching lines @@
   test_fetcher->set_url(final_url);
   test_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
   test_fetcher->set_response_code(RC_REQUEST_OK);
   test_fetcher->set_cookies(cookies_);
   test_fetcher->SetResponseString("<html></html>");
 
   auth.OnURLFetchComplete(test_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
-
-TEST_F(GaiaAuthFetcherTest, ParseClientLoginToOAuth2Response) {
-  {  // No cookies.
-    std::string auth_code;
-    net::ResponseCookies cookies;
-    EXPECT_FALSE(GaiaAuthFetcher::ParseClientLoginToOAuth2Response(
-        cookies, &auth_code));
-    EXPECT_EQ("", auth_code);
-  }
-  {  // Few cookies, nothing appropriate.
-    std::string auth_code;
-    net::ResponseCookies cookies;
-    cookies.push_back(kGetAuthCodeCookieNoSecure);
-    cookies.push_back(kGetAuthCodeCookieNoHttpOnly);
-    cookies.push_back(kGetAuthCodeCookieNoOAuthCode);
-    EXPECT_FALSE(GaiaAuthFetcher::ParseClientLoginToOAuth2Response(
-        cookies, &auth_code));
-    EXPECT_EQ("", auth_code);
-  }
-  {  // Few cookies, one of them is valid.
-    std::string auth_code;
-    net::ResponseCookies cookies;
-    cookies.push_back(kGetAuthCodeCookieNoSecure);
-    cookies.push_back(kGetAuthCodeCookieNoHttpOnly);
-    cookies.push_back(kGetAuthCodeCookieNoOAuthCode);
-    cookies.push_back(kGetAuthCodeValidCookie);
-    EXPECT_TRUE(GaiaAuthFetcher::ParseClientLoginToOAuth2Response(
-        cookies, &auth_code));
-    EXPECT_EQ("test-code", auth_code);
-  }
-  {  // Single valid cookie (like in real responses).
-    std::string auth_code;
-    net::ResponseCookies cookies;
-    cookies.push_back(kGetAuthCodeValidCookie);
-    EXPECT_TRUE(GaiaAuthFetcher::ParseClientLoginToOAuth2Response(
-        cookies, &auth_code));
-    EXPECT_EQ("test-code", auth_code);
-  }
-}
-
-TEST_F(GaiaAuthFetcherTest, ParseOAuth2TokenPairResponse) {
-  {  // No data.
-    std::string rt;
-    std::string at;
-    int exp = -1;
-    EXPECT_FALSE(GaiaAuthFetcher::ParseOAuth2TokenPairResponse(
-        "", &rt, &at, &exp));
-    EXPECT_EQ("", rt);
-    EXPECT_EQ("", at);
-    EXPECT_EQ(-1, exp);
-  }
-  {  // No refresh token.
-    std::string rt;
-    std::string at;
-    int exp = -1;
-    EXPECT_FALSE(GaiaAuthFetcher::ParseOAuth2TokenPairResponse(
-        kGetTokenPairResponseNoRefreshToken, &rt, &at, &exp));
-    EXPECT_EQ("", rt);
-    EXPECT_EQ("", at);
-    EXPECT_EQ(-1, exp);
-  }
-  {  // No access token.
-    std::string rt;
-    std::string at;
-    int exp = -1;
-    EXPECT_FALSE(GaiaAuthFetcher::ParseOAuth2TokenPairResponse(
-        kGetTokenPairResponseNoAccessToken, &rt, &at, &exp));
-    EXPECT_EQ("", rt);
-    EXPECT_EQ("", at);
-    EXPECT_EQ(-1, exp);
-  }
-  {  // No expiration.
-    std::string rt;
-    std::string at;
-    int exp = -1;
-    EXPECT_FALSE(GaiaAuthFetcher::ParseOAuth2TokenPairResponse(
-        kGetTokenPairResponseNoExpiresIn, &rt, &at, &exp));
-    EXPECT_EQ("", rt);
-    EXPECT_EQ("", at);
-    EXPECT_EQ(-1, exp);
-  }
-  {  // Valid response.
-    std::string rt;
-    std::string at;
-    int exp = -1;
-    EXPECT_TRUE(GaiaAuthFetcher::ParseOAuth2TokenPairResponse(
-        kGetTokenPairValidResponse, &rt, &at, &exp));
-    EXPECT_EQ("rt1", rt);
-    EXPECT_EQ("at1", at);
-    EXPECT_EQ(3600, exp);
-  }
-}