Change ProfileDownloader to use AccountTrackerService.

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

 // Copyright 2014 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 <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_downloader.h"
+#include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
@@ skipping 157 matching lines @@
     SetOldUserImageInfo(
         username, user_manager::User::USER_IMAGE_EXTERNAL, image_path);
   }
 
   // Returns the image path for user |username| with specified |extension|.
   base::FilePath GetUserImagePath(const std::string& username,
                                   const std::string& extension) {
     return user_data_dir_.Append(username).AddExtension(extension);
   }
 
+  // Seeds the AccountTrackerService with test data so the ProfileDownloader can
+  // retrieve the picture URL and fetch the image.
+  void SeedAccountTrackerService(const std::string& username,
+                                 Profile* profile) {
+    AccountTrackerService::AccountInfo info;
+    info.account_id = "";

[Nikita (slow), 2015/05/14 18:44:22]

nit: std::string()

[anthonyvd, 2015/05/15 19:46:10]

Done.

+    info.gaia = username;
+    info.email = username;
+    info.full_name = username;
+    info.given_name = username;
+    info.hosted_domain = "";

[Nikita (slow), 2015/05/14 18:44:22]

nit: same here

[anthonyvd, 2015/05/15 19:46:10]

Done.

+    info.locale = username;
+    info.picture_url = "http://localhost/avatar.jpg";
+
+    AccountTrackerServiceFactory::GetForProfile(profile)->SeedAccountInfo(info);
+  }
+
   // Completes the download of all non-image profile data for the user
   // |username|.  This method must only be called after a profile data
   // download has been started.  |url_fetcher_factory| will capture
   // the net::TestURLFetcher created by the ProfileDownloader to
   // download the profile image.
   void CompleteProfileMetadataDownload(
       const std::string& username,
       net::TestURLFetcherFactory* url_fetcher_factory) {
     ProfileDownloader* profile_downloader =
         reinterpret_cast<UserImageManagerImpl*>(
             ChromeUserManager::Get()->GetUserImageManager(username))
             ->profile_downloader_.get();
     ASSERT_TRUE(profile_downloader);
 
     static_cast<OAuth2TokenService::Consumer*>(profile_downloader)->
         OnGetTokenSuccess(NULL,
                           std::string(),
                           base::Time::Now() + base::TimeDelta::FromDays(1));
-
-    net::TestURLFetcher* fetcher = url_fetcher_factory->GetFetcherByID(
-        gaia::GaiaOAuthClient::kUrlFetcherId);
-    ASSERT_TRUE(fetcher);
-    fetcher->SetResponseString(
-        "{ \"picture\": \"http://localhost/avatar.jpg\" }");
-    fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS,
-                                              net::OK));
-    fetcher->set_response_code(200);
-    fetcher->delegate()->OnURLFetchComplete(fetcher);
-    base::RunLoop().RunUntilIdle();
   }
 
   // Completes the download of the currently logged-in user's profile image.
   // This method must only be called after a profile data download including
   // the profile image has been started, the download of all non-image data has
   // been completed by calling CompleteProfileMetadataDownload() and the
   // net::TestURLFetcher created by the ProfileDownloader to download the
   // profile image has been captured by |url_fetcher_factory|.
   void CompleteProfileImageDownload(
       net::TestURLFetcherFactory* url_fetcher_factory) {
@@ skipping 258 matching lines @@
 
 // Verifies that SaveUserImageFromProfileImage() correctly downloads, sets and
 // persists the chosen user image.
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
 
   UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
   LoginUser(kTestUser1);
+  Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
+  SeedAccountTrackerService(kTestUser1, profile);
 
   run_loop_.reset(new base::RunLoop);
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
   user_image_manager->SaveUserImageFromProfileImage();
   run_loop_->Run();
 
   net::TestURLFetcherFactory url_fetcher_factory;
   CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
   CompleteProfileImageDownload(&url_fetcher_factory);
@@ skipping 31 matching lines @@
                        ProfileImageDownloadDoesNotClobber) {
   const user_manager::User* user =
       user_manager::UserManager::Get()->FindUser(kTestUser1);
   ASSERT_TRUE(user);
 
   const gfx::ImageSkia& default_image =
       user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
 
   UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
   LoginUser(kTestUser1);
+  Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
+  SeedAccountTrackerService(kTestUser1, profile);
 
   run_loop_.reset(new base::RunLoop);
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
   user_image_manager->SaveUserImageFromProfileImage();
   run_loop_->Run();
 
   net::TestURLFetcherFactory url_fetcher_factory;
   CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
 
@@ skipping 298 matching lines @@
 
   saved_image = test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();
   ASSERT_TRUE(saved_image);
 
   // Check image dimensions. Images can't be compared since JPEG is lossy.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 }
 
 }  // namespace chromeos