Change default code flag to NewAvatarMenu.

chrome/browser/sync/sync_error_notifier_ash_unittest.cc

Index: chrome/browser/sync/sync_error_notifier_ash_unittest.cc
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index 8de7117f978b8907f7ef49111539992f3cde5f7e..41896b928b1cdcaf501f1abd60803ff650605d81 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
+#include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sync_error_controller.h"
 #include "chrome/browser/ui/browser.h"
@@ -100,6 +101,12 @@ class SyncErrorNotifierTest : public AshTestBase  {
 
     profile_ = profile_manager_->CreateTestingProfile(kTestAccountId);
 
+    // Preload the avatar icon so it's cached for the test's execution.
+    ProfileInfoCache& cache = *profile_manager_->profile_info_cache();
+    cache.GetAvatarIconOfProfileAtIndex(
+        cache.GetIndexOfProfileWithPath(profile_->GetPath()));
+    base::MessageLoop::current()->RunUntilIdle();

[noms (inactive), 2015/03/17 14:26:30]

Should you have an assert after the MessageLoop bit that the avatar actually got
"downloaded"?

[Mike Lerman, 2015/03/18 19:29:48]

Done.

+
     TestingBrowserProcess::GetGlobal();
     AshTestBase::SetUp();