Just some cleanup before I start on the profile name fix.

chrome/browser/profiles/gaia_info_update_service_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 "chrome/browser/profiles/gaia_info_update_service.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_downloader.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_unittest.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 using ::testing::Return;
 using ::testing::NiceMock;
@@ skipping 46 matching lines @@
   }
 
  private:
   Profile* profile_;
 };
 
 } // namespace
 
 TEST_F(GAIAInfoUpdateServiceTest, DownloadSuccess) {
   GAIAInfoUpdateService service(profile());
-  NiceMock<ProfileDownloaderMock> downloader(&service);
 
-  base::string16 name = base::ASCIIToUTF16("Pat Smith");
-  EXPECT_CALL(downloader, GetProfileFullName()).WillOnce(Return(name));
-  gfx::Image image = gfx::test::CreateImage();
-  const SkBitmap* bmp = image.ToSkBitmap();
-  EXPECT_CALL(downloader, GetProfilePicture()).WillOnce(Return(*bmp));
-  EXPECT_CALL(downloader, GetProfilePictureStatus()).
-      WillOnce(Return(ProfileDownloader::PICTURE_SUCCESS));
-  std::string url("foo.com");
-  EXPECT_CALL(downloader, GetProfilePictureURL()).WillOnce(Return(url));
+  {

[noms (inactive), 2014/03/24 13:35:25]

Can you add a comment as to why  we need to put this in a block?

[Roger Tawa OOO till Jul 10th, 2014/03/24 17:49:30]

Removed with change below.

+    NiceMock<ProfileDownloaderMock> downloader(&service);
 
-  // No URL should be cached yet.
-  EXPECT_EQ(std::string(), service.GetCachedPictureURL());
+    base::string16 name = base::ASCIIToUTF16("Pat Smith");
+    EXPECT_CALL(downloader, GetProfileFullName()).WillOnce(Return(name));
+    gfx::Image image = gfx::test::CreateImage();
+    const SkBitmap* bmp = image.ToSkBitmap();
+    EXPECT_CALL(downloader, GetProfilePicture()).WillOnce(Return(*bmp));
+    EXPECT_CALL(downloader, GetProfilePictureStatus()).
+        WillOnce(Return(ProfileDownloader::PICTURE_SUCCESS));
+    std::string url("foo.com");
+    EXPECT_CALL(downloader, GetProfilePictureURL()).WillOnce(Return(url));
 
-  service.OnProfileDownloadSuccess(&downloader);
+    // No URL should be cached yet.
+    EXPECT_EQ(std::string(), service.GetCachedPictureURL());
 
-  // On success both the profile info and GAIA info should be updated.
-  size_t index = GetCache()->GetIndexOfProfileWithPath(profile()->GetPath());
-  EXPECT_EQ(name, GetCache()->GetNameOfProfileAtIndex(index));
-  EXPECT_EQ(name, GetCache()->GetGAIANameOfProfileAtIndex(index));
-  EXPECT_TRUE(gfx::test::IsEqual(
-      image, GetCache()->GetAvatarIconOfProfileAtIndex(index)));
-  EXPECT_TRUE(gfx::test::IsEqual(
-      image, *GetCache()->GetGAIAPictureOfProfileAtIndex(index)));
-  EXPECT_EQ(url, service.GetCachedPictureURL());
+    service.OnProfileDownloadSuccess(&downloader);
+
+    // On success both the profile info and GAIA info should be updated.
+    size_t index = GetCache()->GetIndexOfProfileWithPath(profile()->GetPath());
+    EXPECT_EQ(name, GetCache()->GetNameOfProfileAtIndex(index));
+    EXPECT_EQ(name, GetCache()->GetGAIANameOfProfileAtIndex(index));
+    EXPECT_TRUE(gfx::test::IsEqual(
+        image, GetCache()->GetAvatarIconOfProfileAtIndex(index)));
+    EXPECT_TRUE(gfx::test::IsEqual(
+        image, *GetCache()->GetGAIAPictureOfProfileAtIndex(index)));
+    EXPECT_EQ(url, service.GetCachedPictureURL());
+  }
+
+  service.Shutdown();

[noms (inactive), 2014/03/24 13:35:25]

Do all the tests have to call GAIAInfoUpdateService service(profile()); and
service.Shutdown()? If yes, then maybe that should go in the SetUp/TearDown
methods

[Roger Tawa OOO till Jul 10th, 2014/03/24 17:49:30]

Not all tests use a GAIAInfoUpdateService, so its a local variable.  However,
putting in the base class causes no bad effects for the tests that don't use
one, so moving it there to reduce code duplication.

 }
 
 TEST_F(GAIAInfoUpdateServiceTest, DownloadFailure) {
   size_t index = GetCache()->GetIndexOfProfileWithPath(profile()->GetPath());
   base::string16 old_name = GetCache()->GetNameOfProfileAtIndex(index);
   gfx::Image old_image = GetCache()->GetAvatarIconOfProfileAtIndex(index);
 
   GAIAInfoUpdateService service(profile());
   EXPECT_EQ(std::string(), service.GetCachedPictureURL());
-  NiceMock<ProfileDownloaderMock> downloader(&service);
 
-  service.OnProfileDownloadFailure(&downloader,
-                                   ProfileDownloaderDelegate::SERVICE_ERROR);
+  {
+    NiceMock<ProfileDownloaderMock> downloader(&service);
 
-  // On failure nothing should be updated.
-  EXPECT_EQ(old_name, GetCache()->GetNameOfProfileAtIndex(index));
-  EXPECT_EQ(base::string16(), GetCache()->GetGAIANameOfProfileAtIndex(index));
-  EXPECT_TRUE(gfx::test::IsEqual(
-      old_image, GetCache()->GetAvatarIconOfProfileAtIndex(index)));
-  EXPECT_EQ(NULL, GetCache()->GetGAIAPictureOfProfileAtIndex(index));
-  EXPECT_EQ(std::string(), service.GetCachedPictureURL());
+    service.OnProfileDownloadFailure(&downloader,
+                                     ProfileDownloaderDelegate::SERVICE_ERROR);
+
+    // On failure nothing should be updated.
+    EXPECT_EQ(old_name, GetCache()->GetNameOfProfileAtIndex(index));
+    EXPECT_EQ(base::string16(), GetCache()->GetGAIANameOfProfileAtIndex(index));
+    EXPECT_TRUE(gfx::test::IsEqual(
+        old_image, GetCache()->GetAvatarIconOfProfileAtIndex(index)));
+    EXPECT_EQ(NULL, GetCache()->GetGAIAPictureOfProfileAtIndex(index));
+    EXPECT_EQ(std::string(), service.GetCachedPictureURL());
+  }
+
+  service.Shutdown();
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, ShouldUseGAIAProfileInfo) {
 #if defined(OS_CHROMEOS)
   // This feature should never be enabled on ChromeOS.
   EXPECT_FALSE(GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(profile()));
 #endif
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, ScheduleUpdate) {
   GAIAInfoUpdateService service(profile());
   EXPECT_TRUE(service.timer_.IsRunning());
   service.timer_.Stop();
   EXPECT_FALSE(service.timer_.IsRunning());
   service.ScheduleNextUpdate();
   EXPECT_TRUE(service.timer_.IsRunning());
+
+  service.Shutdown();
 }
 
+#if !defined(OS_CHROMEOS)
+
 TEST_F(GAIAInfoUpdateServiceTest, LogOut) {
-  profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
-                                   "pat@example.com");
+  SigninManager* signin_manager =
+      SigninManagerFactory::GetForProfile(profile());
+  signin_manager->SetAuthenticatedUsername("pat@example.com");
   base::string16 gaia_name = base::UTF8ToUTF16("Pat Foo");
   GetCache()->SetGAIANameOfProfileAtIndex(0, gaia_name);
   gfx::Image gaia_picture = gfx::test::CreateImage();
   GetCache()->SetGAIAPictureOfProfileAtIndex(0, &gaia_picture);
 
   // Set a fake picture URL.
   profile()->GetPrefs()->SetString(prefs::kProfileGAIAInfoPictureURL,
                                    "example.com");
 
   GAIAInfoUpdateService service(profile());
   EXPECT_FALSE(service.GetCachedPictureURL().empty());
+
   // Log out.
-  profile()->GetPrefs()
-      ->SetString(prefs::kGoogleServicesUsername, std::string());
-
+  signin_manager->SignOut();
   // Verify that the GAIA name and picture, and picture URL are unset.
   EXPECT_TRUE(GetCache()->GetGAIANameOfProfileAtIndex(0).empty());
   EXPECT_EQ(NULL, GetCache()->GetGAIAPictureOfProfileAtIndex(0));
   EXPECT_TRUE(service.GetCachedPictureURL().empty());
+
+  service.Shutdown();
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, LogIn) {
-  profile()->GetPrefs()
-      ->SetString(prefs::kGoogleServicesUsername, std::string());
   GAIAInfoUpdateServiceMock service(profile());
 
   // Log in.
   EXPECT_CALL(service, Update());
-  profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
-                                   "pat@example.com");
+  SigninManager* signin_manager =
+      SigninManagerFactory::GetForProfile(profile());
+  signin_manager->OnExternalSigninCompleted("pat@example.com");
+
+  service.Shutdown();
 }
+
+#endif