Merge 118016 - Disable GAIA profile info

chrome/browser/profiles/gaia_info_update_service_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_info_cache_unittest.h"
 #include "chrome/common/pref_names.h"
@@ skipping 137 matching lines @@
   EXPECT_TRUE(gfx::test::IsEqual(
       old_image, GetCache()->GetAvatarIconOfProfileAtIndex(index)));
   EXPECT_TRUE(gfx::test::IsEqual(
       new_image, *GetCache()->GetGAIAPictureOfProfileAtIndex(index)));
 }
 
 TEST_F(GAIAInfoUpdateServiceTest, ShouldUseGAIAProfileInfo) {
 #if defined(OS_CHROMEOS)
   // This feature should never be enabled on ChromeOS.
   EXPECT_FALSE(GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(profile()));
-#else
-  bool sync_enabled = profile()->GetOriginalProfile()->IsSyncAccessible();
-  EXPECT_EQ(sync_enabled,
-            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());
@@ skipping 24 matching lines @@
 
 TEST_F(GAIAInfoUpdateServiceTest, LogIn) {
   profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, "");
   GAIAInfoUpdateServiceMock service(profile());
 
   // Log in.
   EXPECT_CALL(service, Update());
   profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                    "pat@example.com");
 }