Change semantics of newProfileManagement() to accountConsistency()

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 67 matching lines @@
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_IOS)
 // This test doesn't make sense for ChromeOS since it has a different
 // multi-profiles menu in the system tray instead.
 //
 // Mobile platforms are also excluded due to a lack of avatar menu.
 #define MAYBE_ViewProfileUMA DISABLED_ViewProfileUMA
 #else
 #define MAYBE_ViewProfileUMA ViewProfileUMA
 #endif
 
-IN_PROC_BROWSER_TEST_F(ProfileChooserViewBrowserTest, MAYBE_ViewProfileUMA) {
+// TODO(mlerman): Re-enable the test to MAYBE_ViewProfileUMA once there is a
+// launch plan for EnableAccountConsistency.
+IN_PROC_BROWSER_TEST_F(ProfileChooserViewBrowserTest, DISABLED_ViewProfileUMA) {
   UMAHistogramHelper histograms;
   // If multiprofile mode is not enabled, you can't switch between profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   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);
 }