Change X-Auto-Login implementation to use OAuth token.

chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc

Index: chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index 8a17a831c9882c01bfc282b67283c163b6ada66c..0b1731360f0a47de58509a01c3d8401a21bad358 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -116,7 +116,10 @@ class GaiaAuthFetcherTest : public testing::Test {
             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()) {}
+        merge_session_source_(GaiaUrls::GetInstance()->merge_session_url()),
+        uberauth_token_source_(base::StringPrintf(
+            "%s?source=&issueuberauth=1",
+            GaiaUrls::GetInstance()->oauth1_login_url().c_str())) {}
 
   void RunParsingTest(const std::string& data,
                       const std::string& sid,
@@ -163,6 +166,7 @@ class GaiaAuthFetcherTest : public testing::Test {
   GURL oauth2_token_source_;
   GURL token_auth_source_;
   GURL merge_session_source_;
+  GURL uberauth_token_source_;
   TestingProfile profile_;
  protected:
   MessageLoop message_loop_;
@@ -182,6 +186,7 @@ class MockGaiaConsumer : public GaiaAuthConsumer {
            int expires_in_secs));
   MOCK_METHOD1(OnTokenAuthSuccess, void(const std::string& data));
   MOCK_METHOD1(OnMergeSessionSuccess, void(const std::string& data));
+  MOCK_METHOD1(OnUberAuthTokenSuccess, void(const std::string& data));
   MOCK_METHOD1(OnClientLoginFailure,
       void(const GoogleServiceAuthError& error));
   MOCK_METHOD2(OnIssueAuthTokenFailure, void(const std::string& service,
@@ -191,6 +196,8 @@ class MockGaiaConsumer : public GaiaAuthConsumer {
   MOCK_METHOD1(OnTokenAuthFailure, void(const GoogleServiceAuthError& error));
   MOCK_METHOD1(OnMergeSessionFailure, void(
       const GoogleServiceAuthError& error));
+  MOCK_METHOD1(OnUberAuthTokenFailure, void(
+      const GoogleServiceAuthError& error));
 };
 
 TEST_F(GaiaAuthFetcherTest, ErrorComparator) {
@@ -772,6 +779,28 @@ TEST_F(GaiaAuthFetcherTest, MergeSessionSuccessRedirect) {
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
+TEST_F(GaiaAuthFetcherTest, UberAuthTokenSuccess) {
+  MockGaiaConsumer consumer;
+  EXPECT_CALL(consumer, OnUberAuthTokenSuccess("uberToken"))
+      .Times(1);
+
+  TestingProfile profile;
+  TestURLFetcherFactory factory;
+
+  GaiaAuthFetcher auth(&consumer, std::string(),
+      profile_.GetRequestContext());
+  auth.StartUberAuthTokenFetch("myAccessToken");
+
+  EXPECT_TRUE(auth.HasPendingFetch());
+  MockFetcher mock_fetcher(
+      uberauth_token_source_,
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
+      RC_REQUEST_OK, cookies_, "uberToken", content::URLFetcher::POST,
+      &auth);
+  auth.OnURLFetchComplete(&mock_fetcher);
+  EXPECT_FALSE(auth.HasPendingFetch());
+}
+
 TEST_F(GaiaAuthFetcherTest, ParseClientLoginToOAuth2Response) {
   {  // No cookies.
     std::string auth_code;