Clean up terminology used in about_flags.

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 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_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 450 matching lines @@
                     profiles::USER_MANAGER_TUTORIAL_OVERVIEW,
                     profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
 }
 
 void EnableNewProfileManagementPreview(Profile* profile) {
 #if defined(OS_ANDROID)
   NOTREACHED();
 #else
   // TODO(rogerta): instead of setting experiment flags and command line
   // args, we should set a profile preference.
-  const about_flags::Experiment experiment = {
+  const about_flags::FeatureEntry entry = {
       kNewProfileManagementExperimentInternalName,
       0,  // string id for title of experiment
       0,  // string id for description of experiment
       0,  // supported platforms
-      about_flags::Experiment::ENABLE_DISABLE_VALUE,
+      about_flags::FeatureEntry::ENABLE_DISABLE_VALUE,
       switches::kEnableNewProfileManagement,
       "",  // not used with ENABLE_DISABLE_VALUE type
       switches::kDisableNewProfileManagement,
       "",  // not used with ENABLE_DISABLE_VALUE type
       NULL,  // not used with ENABLE_DISABLE_VALUE type
       3
   };
   flags_ui::PrefServiceFlagsStorage flags_storage(
       g_browser_process->local_state());
-  about_flags::SetExperimentEnabled(
-      &flags_storage,
-      experiment.NameForChoice(1),
-      true);
+  about_flags::SetFeatureEntryEnabled(&flags_storage, entry.NameForChoice(1),
+                                      true);
 
   switches::EnableNewProfileManagementForTesting(
       base::CommandLine::ForCurrentProcess());
   UserManager::Show(base::FilePath(),
                     profiles::USER_MANAGER_TUTORIAL_OVERVIEW,
                     profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
   UpdateServicesWithNewProfileManagementFlag(profile, true);
 #endif
 }
 
 void DisableNewProfileManagementPreview(Profile* profile) {
   flags_ui::PrefServiceFlagsStorage flags_storage(
       g_browser_process->local_state());
-  about_flags::SetExperimentEnabled(
+  about_flags::SetFeatureEntryEnabled(
       &flags_storage,
       kNewProfileManagementExperimentInternalName,
       false);
   chrome::AttemptRestart();
   UpdateServicesWithNewProfileManagementFlag(profile, false);
 }
 
 void BubbleViewModeFromAvatarBubbleMode(
     BrowserWindow::AvatarBubbleMode mode,
     BubbleViewMode* bubble_view_mode,
@@ skipping 44 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   const bool dismissed = local_state->GetBoolean(
       prefs::kProfileAvatarRightClickTutorialDismissed);
 
   // Don't show the tutorial if it's already been dismissed or if right-clicking
   // wouldn't show any targets.
   return !dismissed && HasProfileSwitchTargets(profile);
 }
 
 }  // namespace profiles