[Dice] Only show the sync promo account icon when migrated to Dice

The account icon of the first sync promo account is now only
shown in the avatar toolbar when the profile is fully migrated to Dice.

Bug: 889325
Change-Id: I75dfbbc4cbf24d94e42d3b243dce15cb857066f0
Reviewed-on: https://chromium-review.googlesource.com/1249268
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594793}

chrome/browser/ui/views/profiles/avatar_toolbar_button.cc

@@ -294,9 +294,13 @@ gfx::Image AvatarToolbarButton::GetIconImageFromProfile() const {
   }
 
 #if !defined(OS_CHROMEOS)
-  // If the user isn't signed in and the profile icon wasn't changed explicitly,
-  // try to use the first account icon of the sync promo.
-  if (!SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated() &&
+  // Try to show the first account icon of the sync promo when the following
+  // conditions are satisfied:
+  //  - the user is migrated to Dice
+  //  - the user isn't signed in
+  //  - the profile icon wasn't explicitly changed
+  if (AccountConsistencyModeManager::IsDiceEnabledForProfile(profile_) &&
+      !SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated() &&
       entry->IsUsingDefaultAvatar()) {
     std::vector<AccountInfo> promo_accounts =
         signin_ui_util::GetAccountsForDicePromos(profile_);

chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

@@ -484,15 +484,10 @@ IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest,
   ShowAndVerifyUi();
 }
 
-// Crashes on Win only.  http://crbug.com/820390
-#if defined(OS_WIN)
-#define MAYBE_InvokeUi_SupervisedUser DISABLED_InvokeUi_SupervisedUser
-#else
-#define MAYBE_InvokeUi_SupervisedUser InvokeUi_SupervisedUser
-#endif
+// Crashes because account consistency changes:  http://crbug.com/820390
 // Shows the |ProfileChooserView| when a supervised user is the active profile.
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest,
-                       MAYBE_InvokeUi_SupervisedUser) {
+                       DISABLED_InvokeUi_SupervisedUser) {
   ScopedAccountConsistencyDiceFixAuthErrors scoped_account_consistency;
   ShowAndVerifyUi();
 }