Initial refactoring complete

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 <string>
 
 #include "base/message_loop.h"
@@ skipping 439 matching lines @@
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenSuccess("service", "token"))
       .Times(1);
 
   TestingProfile profile;
   TestURLFetcherFactory factory;
   URLFetcher::set_factory(&factory);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
-  auth.StartIssueAuthToken("sid", "lsid", "service");
+
+//   auth.StartIssueAuthToken("sid", "lsid", "service");
+  GaiaAuthConsumer::ClientLoginResult credentials;
+  credentials.sid = "sid";
+  credentials.lsid = "lsid";
+  auth.StartIssueAuthToken(credentials, "service");
 
   URLFetcher::set_factory(NULL);
   EXPECT_TRUE(auth.HasPendingFetch());
   auth.OnURLFetchComplete(
       NULL,
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       RC_REQUEST_OK,
       cookies_,
       "token");
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, FullTokenFailure) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenFailure("service", _))
       .Times(1);
 
   TestingProfile profile;
   TestURLFetcherFactory factory;
   URLFetcher::set_factory(&factory);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
-  auth.StartIssueAuthToken("sid", "lsid", "service");
+//   auth.StartIssueAuthToken("sid", "lsid", "service");
+  GaiaAuthConsumer::ClientLoginResult credentials;
+  credentials.sid = "sid";
+  credentials.lsid = "lsid";
+  auth.StartIssueAuthToken(credentials, "service");
 
   URLFetcher::set_factory(NULL);
   EXPECT_TRUE(auth.HasPendingFetch());
   auth.OnURLFetchComplete(
       NULL,
       issue_auth_token_source_,
       net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
       RC_FORBIDDEN,
       cookies_,
       "");
   EXPECT_FALSE(auth.HasPendingFetch());
 }