One-time migration of NPAPI Flash to PPAPI Flash.

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index f07c87563b1691a5e424f6df0137fae2035e93b8..65b885789c7542acb9adcefb398446159473e225 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -905,17 +905,9 @@ const char kPluginsEnabledPlugins[] = "plugins.plugins_enabled";
 
 // When bundled NPAPI Flash is removed, if at that point it is enabled while
 // Pepper Flash is disabled, we would like to turn on Pepper Flash. And we will
-// want to do so only once.
-const char kPluginsMigratedToPepperFlash[] = "plugins.migrated_to_pepper_flash";
-
-// In the early stage of component-updated PPAPI Flash, we did field trials in
-// which it was set to disabled by default. The corresponding settings item may
-// remain in some users' profiles. Currently it affects both the bundled and
-// component-updated PPAPI Flash (since the two share the same enable/disable
-// state). We want to remove this item to get those users to use PPAPI Flash.
-// We will want to do so only once.
-const char kPluginsRemovedOldComponentPepperFlashSettings[] =
-    "plugins.removed_old_component_pepper_flash_settings";
+// want to do so in M45, once, for realz.
+const char kNpapiFlashMigratedToPepperFlash[] =
+    "plugins.npapi_flash_migrated_to_pepper_flash";
 
 #if !defined(OS_ANDROID)
 // Whether about:plugins is shown in the details mode or not.