Change ProfileDownloader to use AccountTrackerService.

chrome/browser/signin/signin_manager_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.
 
 #include "components/signin/core/browser/signin_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 258 matching lines @@
   EXPECT_FALSE(manager_->IsAuthenticated());
 
   std::string gaia_id = "12345";
   std::string email = "user@google.com";
 
   FakeAccountTrackerService* account_tracker_service =
     static_cast<FakeAccountTrackerService*>(
         AccountTrackerServiceFactory::GetForProfile(profile()));
   account_tracker_service->SeedAccountInfo(gaia_id, email);
   account_tracker_service->EnableNetworkFetches();
-  std::string account_id = account_tracker_service->PickAccountIdForAccount(
-      gaia_id, email);
 
   ASSERT_TRUE(signin_client()->get_signed_in_password().empty());
 
   manager_->StartSignInWithRefreshToken(
       "rt1",
       gaia_id,
       email,
       "password",
       SigninManager::OAuthTokenFetchedCallback());
 
   // PostSignedIn is not called until the AccountTrackerService returns.
   ASSERT_EQ("", signin_client()->get_signed_in_password());
 
-  account_tracker_service->FakeUserInfoFetchSuccess(
-      account_id, email, gaia_id, "google.com");
+  account_tracker_service->FakeUserInfoFetchSuccess(email,
+                                                    gaia_id,
+                                                    "google.com",
+                                                    "full_name",
+                                                    "given_name",
+                                                    "locale",
+                                                    "http://www.google.com");
 
   // AccountTracker and SigninManager are both done and PostSignedIn was called.
   ASSERT_EQ("password", signin_client()->get_signed_in_password());
 
   ExpectSignInWithRefreshTokenSuccess();
 
 }
 
 TEST_F(SigninManagerTest, SignOut) {
   SetUpSigninManagerAsService();
@@ skipping 128 matching lines @@
             profile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername));
 
   // Make sure account tracker was updated.
   AccountTrackerService* service =
       AccountTrackerServiceFactory::GetForProfile(profile());
   AccountTrackerService::AccountInfo info = service->GetAccountInfo(
       manager_->GetAuthenticatedAccountId());
   EXPECT_EQ("user@gmail.com", info.email);
   EXPECT_EQ("account_id", info.gaia);
 }