Enable the MD User Menu by default on trunk.

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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 233 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, ViewProfileUMA) {
   ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());
 
   base::HistogramTester histograms;
   Profile* profile = browser()->profile();
   profile->GetPrefs()->SetInteger(prefs::kProfileAvatarTutorialShown, 0);
 
   ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser()));
 
-  histograms.ExpectUniqueSample("Profile.NewAvatarMenu.Upgrade",
-      ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW, 1);
+  // The MD user menu doesn't display any upgrade toast so it doesn't log this
+  // in UMA.
+  if (!switches::IsMaterialDesignUserMenu()) {
+    histograms.ExpectUniqueSample("Profile.NewAvatarMenu.Upgrade",
+        ProfileMetrics::PROFILE_AVATAR_MENU_UPGRADE_VIEW, 1);
+  }
 }
 
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, LockProfile) {
   ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());
 
   // Set up the message loop for the user manager.
   scoped_refptr<content::MessageLoopRunner> runner(
       new content::MessageLoopRunner);
   UserManager::AddOnUserManagerShownCallbackForTesting(runner->QuitClosure());
 
@@ skipping 73 matching lines @@
   // Wait until the user manager is shown.
   runner->Run();
 
   // Assert that the first profile's extensions are not blocked.
   ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size());
   ASSERT_EQ(0U, registry->blocked_extensions().size());
 
   // We need to hide the User Manager or else the process can't die.
   UserManager::Hide();
 }