Change new-avatar-menu to an enable-disable flag.

chrome/browser/profiles/profile_list_desktop_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/profile_list_desktop.h"
 
 #include <string>
 
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/common/signin_switches.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
 
 namespace {
 
 class MockObserver : public AvatarMenuObserver {
  public:
@@ skipping 13 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockObserver);
 };
 
 class ProfileListDesktopTest : public testing::Test {
  public:
   ProfileListDesktopTest()
       : manager_(TestingBrowserProcess::GetGlobal()) {
   }
 
   virtual void SetUp() {
+    CommandLine::ForCurrentProcess()->
+        AppendSwitch(switches::kDisableNewAvatarMenu);
     ASSERT_TRUE(manager_.SetUp());
 #if defined(OS_CHROMEOS)
     // AvatarMenu and multiple profiles works after user logged in.
     manager_.SetLoggedIn(true);
 #endif
   }
 
   AvatarMenu* GetAvatarMenu() {
     // Reset the MockObserver.
     mock_observer_.reset(new MockObserver());
@@ skipping 275 matching lines @@
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_SUPERVISED_USER_AVATAR_LABEL);
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_NE(item1.sync_state, supervised_user_label);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(item2.sync_state, supervised_user_label);
 }
 
 }  // namespace