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

chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.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/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 35 matching lines @@
 };
 
 ProfileChooserViewBrowserTest::ProfileChooserViewBrowserTest() {
 }
 
 ProfileChooserViewBrowserTest::~ProfileChooserViewBrowserTest() {
 }
 
 void ProfileChooserViewBrowserTest::SetUp() {
   InProcessBrowserTest::SetUp();
-  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(

[msw, 2014/08/01 16:45:14]

Should this instead ASSERT_EQ/EXPECT_EQ switches::IsNewAvatarMenu()?

[Mike Lerman, 2014/08/01 19:15:00]

Done.

-      switches::kNewAvatarMenu));
 }
 
 void ProfileChooserViewBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
-  command_line->AppendSwitch(switches::kNewAvatarMenu);
 }
 
 void ProfileChooserViewBrowserTest::OpenProfileChooserView() {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());
   NewAvatarButton* button = browser_view->frame()->GetNewAvatarMenuButton();
   ASSERT_TRUE(button);
 
   ProfileChooserView::clear_close_on_deactivate_for_testing();
   ui::MouseEvent mouse_ev(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0,
                           0);
@@ skipping 22 matching lines @@
 
   Profile* profile = browser()->profile();
   profile->GetPrefs()->SetInteger(prefs::kProfileAvatarTutorialShown, 0);
 
   ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView());
 
   histograms.Fetch();
   histograms.ExpectUniqueSample("Profile.UpgradeEnrollment",
       ProfileMetrics::PROFILE_ENROLLMENT_SHOW_PREVIEW_PROMO, 1);
 }