Revert of Change default code flag to NewAvatarMenu.

chrome/browser/sync/sync_error_notifier_ash_unittest.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 "chrome/browser/sync/sync_error_notifier_ash.h"
 
 #include "ash/test/ash_test_base.h"
-#include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #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_avatar_icon_util.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"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.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 "testing/gtest/include/gtest/gtest.h"
@@ skipping 71 matching lines @@
   SyncErrorNotifierTest() {}
   ~SyncErrorNotifierTest() override {}
 
   void SetUp() override {
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
     profile_ = profile_manager_->CreateTestingProfile(kTestAccountId);
 
-#if !defined(OS_CHROMEOS)
-    // Preload the desktop avatar icon so it's cached for the test's execution.
-    ProfileInfoCache& cache = *profile_manager_->profile_info_cache();
-    size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
-    cache.GetAvatarIconOfProfileAtIndex(index);
-    base::MessageLoop::current()->RunUntilIdle();
-    ASSERT_TRUE(base::PathExists(profiles::GetPathOfHighResAvatarAtIndex(
-        cache.GetAvatarIconIndexOfProfileAtIndex(index))));
-#endif
-
     TestingBrowserProcess::GetGlobal();
     AshTestBase::SetUp();
 
     // Set up a desktop screen for Windows to hold native widgets, used when
     // adding desktop widgets (i.e., message center notifications).
 #if defined(OS_WIN)
     test_screen_.reset(aura::TestScreen::Create(gfx::Size()));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
     gfx::Screen::SetScreenTypeDelegate(&screen_type_delegate_);
 #endif
@@ skipping 119 matching lines @@
     SCOPED_TRACE("Not expecting notification since sync setup is incomplete");
     VerifySyncErrorNotifierResult(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
         false /* not signed in */,
         false /* no error */);
   }
 }
 
 }  // namespace test
 }  // namespace ash