Remove URLRequest::GetResponseCookies and URLRequestJob::GetResponseCookies.

google_apis/gaia/gaia_auth_fetcher_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.
 //
 // A complete set of unit tests for GaiaAuthFetcher.
 // Originally ported from GoogleAuthenticator tests.
 
 #include <string>
 
 #include "base/json/json_reader.h"
+#include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/mock_url_fetcher_factory.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using ::testing::Invoke;
 using ::testing::_;
 
+namespace {
+std::string CookieStringToHeader(const char* cookie_string) {
+  return std::string("Set-Cookie: ") + cookie_string;
+}
+}

[mmenke, 2016/06/08 14:46:44]

nit:  // namespace

[mmenke, 2016/06/08 14:46:44]

Also, while you're here, this should probably be expanded to include all the
const character arrays below.

[martijnc, 2016/06/08 16:08:10]

Both done.

+
 const char kGetAuthCodeValidCookie[] =
     "oauth_code=test-code; Path=/test; Secure; HttpOnly";
 const char kGetAuthCodeCookieNoSecure[] =
     "oauth_code=test-code; Path=/test; HttpOnly";
 const char kGetAuthCodeCookieNoHttpOnly[] =
     "oauth_code=test-code; Path=/test; Secure";
 const char kGetAuthCodeCookieNoOAuthCode[] =
     "Path=/test; Secure; HttpOnly";
 const char kGetTokenPairValidResponse[] =
     "{"
@@ skipping 19 matching lines @@
     error = net::ERR_FAILED;
   }
 
   set_status(net::URLRequestStatus::FromError(error));
   SetResponseString(results);
 }
 
 MockFetcher::MockFetcher(const GURL& url,
                          const net::URLRequestStatus& status,
                          int response_code,
-                         const net::ResponseCookies& cookies,
                          const std::string& results,
                          net::URLFetcher::RequestType request_type,
                          net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(status);
   set_response_code(response_code);
-  set_cookies(cookies);
   SetResponseString(results);
 }
 
 MockFetcher::~MockFetcher() {}
 
 void MockFetcher::Start() {
   delegate()->OnURLFetchComplete(this);
 }
 
 class GaiaAuthFetcherTest : public testing::Test {
@@ skipping 42 matching lines @@
                                              &out_error,
                                              &out_error_url,
                                              &out_captcha_url,
                                              &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 issue_auth_token_source_;
   GURL client_login_to_oauth2_source_;
   GURL oauth2_token_source_;
   GURL token_auth_source_;
   GURL merge_session_source_;
   GURL uberauth_token_source_;
   GURL oauth_login_gurl_;
 
  protected:
   net::TestURLRequestContextGetter* GetRequestContext() {
@@ skipping 74 matching lines @@
 
   GoogleServiceAuthError expected_error =
       GoogleServiceAuthError::FromConnectionError(error_no);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenFailure(_, expected_error))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
 
-  MockFetcher mock_fetcher(
-      issue_auth_token_source_, status, 0, cookies_, std::string(),
-      net::URLFetcher::GET, &auth);
+  MockFetcher mock_fetcher(issue_auth_token_source_, status, 0, std::string(),
+                           net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 
 TEST_F(GaiaAuthFetcherTest, ParseRequest) {
   RunParsingTest("SID=sid\nLSID=lsid\nAuth=auth\n", "sid", "lsid", "auth");
   RunParsingTest("LSID=lsid\nSID=sid\nAuth=auth\n", "sid", "lsid", "auth");
   RunParsingTest("SID=sid\nLSID=lsid\nAuth=auth", "sid", "lsid", "auth");
   RunParsingTest("SID=sid\nAuth=auth\n", "sid", std::string(), "auth");
   RunParsingTest("LSID=lsid\nAuth=auth\n", std::string(), "lsid", "auth");
@@ skipping 16 matching lines @@
                       "CaptchaUrl=C\n", "E", "U", "C", "T");
 }
 
 TEST_F(GaiaAuthFetcherTest, WorkingIssueAuthToken) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenSuccess(_, "token"))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
-  MockFetcher mock_fetcher(
-      issue_auth_token_source_, status, net::HTTP_OK, cookies_, "token",
-      net::URLFetcher::GET, &auth);
+  MockFetcher mock_fetcher(issue_auth_token_source_, status, net::HTTP_OK,
+                           "token", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, CheckTwoFactorResponse) {
   std::string response =
       base::StringPrintf("Error=BadAuthentication\n%s\n",
                          GaiaAuthFetcher::kSecondFactor);
   EXPECT_TRUE(GaiaAuthFetcher::IsSecondFactorSuccess(response));
 }
 
@@ skipping 66 matching lines @@
   EXPECT_CALL(consumer, OnIssueAuthTokenSuccess("service", "token"))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartIssueAuthToken("sid", "lsid", "service");
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       issue_auth_token_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "token",
-      net::URLFetcher::GET, &auth);
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0), net::HTTP_OK,
+      "token", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, FullTokenFailure) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenFailure("service", _))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartIssueAuthToken("sid", "lsid", "service");
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_FORBIDDEN,
-      cookies_,
       std::string(),
       net::URLFetcher::GET,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthCode("test-code")).Times(0);
   EXPECT_CALL(consumer, OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
 
   net::TestURLFetcherFactory factory;
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartCookieForOAuthLoginTokenExchange("0");
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   EXPECT_TRUE(NULL != fetcher);
   EXPECT_EQ(net::LOAD_NORMAL, fetcher->GetLoadFlags());
   EXPECT_EQ(std::string::npos,
             fetcher->GetOriginalURL().query().find("device_type=chrome"));
 
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeValidCookie);
   EXPECT_TRUE(auth.HasPendingFetch());
+  scoped_refptr<net::HttpResponseHeaders> reponse_headers =
+      new net::HttpResponseHeaders("");
+  reponse_headers->AddHeader(CookieStringToHeader(kGetAuthCodeValidCookie));
   MockFetcher mock_fetcher1(
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK,
-      cookies,
       std::string(),
       net::URLFetcher::POST,
       &auth);
+  mock_fetcher1.set_response_headers(reponse_headers);
   auth.OnURLFetchComplete(&mock_fetcher1);
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher2(
       oauth2_token_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, kGetTokenPairValidResponse,
-      net::URLFetcher::POST, &auth);
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0), net::HTTP_OK,
+      kGetTokenPairValidResponse, net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_fetcher2);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenSuccessNoTokenFetch) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthCode("test-code")).Times(1);
   EXPECT_CALL(consumer, OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("", "", 0))).Times(0);
 
   net::TestURLFetcherFactory factory;
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartCookieForOAuthLoginTokenExchange(
       false, "0", "ABCDE_12345", "");
   net::TestURLFetcher* fetcher = factory.GetFetcherByID(0);
   EXPECT_TRUE(NULL != fetcher);
   EXPECT_EQ(net::LOAD_NORMAL, fetcher->GetLoadFlags());
   EXPECT_EQ(std::string::npos,
             fetcher->GetOriginalURL().query().find("device_type=chrome"));
 
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeValidCookie);
+  scoped_refptr<net::HttpResponseHeaders> reponse_headers =
+      new net::HttpResponseHeaders("");
+  reponse_headers->AddHeader(CookieStringToHeader(kGetAuthCodeValidCookie));
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher1(
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK,
-      cookies,
       std::string(),
       net::URLFetcher::POST,
       &auth);
+  mock_fetcher1.set_response_headers(reponse_headers);
   auth.OnURLFetchComplete(&mock_fetcher1);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenWithCookies_DeviceId) {
   MockGaiaConsumer consumer;
   net::TestURLFetcherFactory factory;
   std::string expected_device_id("ABCDE-12345");
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartCookieForOAuthLoginTokenExchangeWithDeviceId("0",
@@ skipping 12 matching lines @@
 
 TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenClientLoginToOAuth2Failure) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthFailure(_))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartCookieForOAuthLoginTokenExchange(std::string());
 
-  net::ResponseCookies cookies;
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_FORBIDDEN,
-      cookies,
       std::string(),
       net::URLFetcher::POST,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, OAuthLoginTokenOAuth2TokenPairFailure) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientOAuthFailure(_))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartCookieForOAuthLoginTokenExchange(std::string());
 
-  net::ResponseCookies cookies;
-  cookies.push_back(kGetAuthCodeValidCookie);
+  scoped_refptr<net::HttpResponseHeaders> reponse_headers =
+      new net::HttpResponseHeaders("");
+  reponse_headers->AddHeader(CookieStringToHeader(kGetAuthCodeValidCookie));
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher1(
       client_login_to_oauth2_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_OK,
-      cookies,
       std::string(),
       net::URLFetcher::POST,
       &auth);
+  mock_fetcher1.set_response_headers(reponse_headers);
   auth.OnURLFetchComplete(&mock_fetcher1);
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher2(
       oauth2_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       net::HTTP_FORBIDDEN,
-      cookies_,
       std::string(),
       net::URLFetcher::POST,
       &auth);
   auth.OnURLFetchComplete(&mock_fetcher2);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, MergeSessionSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnMergeSessionSuccess("<html></html>"))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartMergeSession("myubertoken", std::string());
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       merge_session_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "<html></html>", net::URLFetcher::GET,
-      &auth);
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0), net::HTTP_OK,
+      "<html></html>", net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, MergeSessionSuccessRedirect) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnMergeSessionSuccess("<html></html>"))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartMergeSession("myubertoken", std::string());
 
   // Make sure the fetcher created has the expected flags.  Set its url()
   // properties to reflect a redirect.
   net::TestURLFetcher* test_fetcher = factory.GetFetcherByID(0);
   EXPECT_TRUE(test_fetcher != NULL);
   EXPECT_TRUE(test_fetcher->GetLoadFlags() == net::LOAD_NORMAL);
   EXPECT_TRUE(auth.HasPendingFetch());
 
   GURL final_url("http://www.google.com/CheckCookie");
   test_fetcher->set_url(final_url);
   test_fetcher->set_status(
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0));
   test_fetcher->set_response_code(net::HTTP_OK);
-  test_fetcher->set_cookies(cookies_);
   test_fetcher->SetResponseString("<html></html>");
 
   auth.OnURLFetchComplete(test_fetcher);
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, UberAuthTokenSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnUberAuthTokenSuccess("uberToken"))
       .Times(1);
 
   net::TestURLFetcherFactory factory;
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartTokenFetchForUberAuthExchange("myAccessToken");
 
   EXPECT_TRUE(auth.HasPendingFetch());
   MockFetcher mock_fetcher(
       uberauth_token_source_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      net::HTTP_OK, cookies_, "uberToken", net::URLFetcher::POST,
-      &auth);
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0), net::HTTP_OK,
+      "uberToken", net::URLFetcher::POST, &auth);
   auth.OnURLFetchComplete(&mock_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));
@@ skipping 40 matching lines @@
   result.sid = "sid";
   result.token = "auth";
   result.data = data;
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginSuccess(result))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
-  MockFetcher mock_fetcher(
-      oauth_login_gurl_, status, net::HTTP_OK, cookies_, data,
-      net::URLFetcher::GET, &auth);
+  MockFetcher mock_fetcher(oauth_login_gurl_, status, net::HTTP_OK, data,
+                           net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, ListAccounts) {
   std::string data("[\"gaia.l.a.r\", ["
       "[\"gaia.l.a\", 1, \"First Last\", \"user@gmail.com\", "
       "\"//googleusercontent.com/A/B/C/D/photo.jpg\", 1, 1, 0]]]");
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnListAccountsSuccess(data)).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
-      GaiaUrls::GetInstance()->ListAccountsURLWithSource(std::string()),
-      status, net::HTTP_OK, cookies_, data, net::URLFetcher::GET, &auth);
+      GaiaUrls::GetInstance()->ListAccountsURLWithSource(std::string()), status,
+      net::HTTP_OK, data, net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, LogOutSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnLogOutSuccess()).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       GaiaUrls::GetInstance()->LogOutURLWithSource(std::string()), status,
-      net::HTTP_OK, cookies_, std::string(), net::URLFetcher::GET, &auth);
+      net::HTTP_OK, std::string(), net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, LogOutFailure) {
   int error_no = net::ERR_CONNECTION_RESET;
   net::URLRequestStatus status(net::URLRequestStatus::FAILED, error_no);
 
   GoogleServiceAuthError expected_error =
       GoogleServiceAuthError::FromConnectionError(error_no);
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnLogOutFailure(expected_error)).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
 
   MockFetcher mock_fetcher(
       GaiaUrls::GetInstance()->LogOutURLWithSource(std::string()), status, 0,
-      cookies_, std::string(), net::URLFetcher::GET, &auth);
+      std::string(), net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, GetCheckConnectionInfo) {
   std::string data(
       "[{\"carryBackToken\": \"token1\", \"url\": \"http://www.google.com\"}]");
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnGetCheckConnectionInfoSuccess(data)).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       GaiaUrls::GetInstance()->GetCheckConnectionInfoURLWithSource(
           std::string()),
-      status, net::HTTP_OK, cookies_, data, net::URLFetcher::GET, &auth);
+      status, net::HTTP_OK, data, net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, ListIDPSessions) {
   std::string data("{\"sessions\":[{\"login_hint\":\"abcdefghijklmnop\"}]}");
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnListIdpSessionsSuccess("abcdefghijklmnop")).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartListIDPSessions(std::string(), std::string());
 
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
-  MockFetcher mock_fetcher(
-      GaiaUrls::GetInstance()->oauth2_iframe_url(),
-      status, net::HTTP_OK, cookies_, data, net::URLFetcher::GET, &auth);
+  MockFetcher mock_fetcher(GaiaUrls::GetInstance()->oauth2_iframe_url(), status,
+                           net::HTTP_OK, data, net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }
 
 TEST_F(GaiaAuthFetcherTest, GetTokenResponse) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer,
               OnGetTokenResponseSuccess(
                   GaiaAuthConsumer::ClientOAuthResult(std::string(),
                                                       "at1",
                                                       3600))).Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(), GetRequestContext());
   auth.StartGetTokenResponse(std::string(), std::string(), std::string());
 
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
-  MockFetcher mock_fetcher(
-      GaiaUrls::GetInstance()->oauth2_iframe_url(),
-      status, net::HTTP_OK, cookies_, kGetTokenPairValidResponse,
-      net::URLFetcher::GET, &auth);
+  MockFetcher mock_fetcher(GaiaUrls::GetInstance()->oauth2_iframe_url(), status,
+                           net::HTTP_OK, kGetTokenPairValidResponse,
+                           net::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }