One-time migration of NPAPI Flash to PPAPI Flash.

chrome/browser/plugins/plugin_prefs.cc

 // Copyright (c) 2012 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/plugins/plugin_prefs.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 310 matching lines @@
   base::FilePath cur_internal_dir;
   if (PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &cur_internal_dir) &&
       cur_internal_dir != last_internal_dir) {
     update_internal_dir = true;
     prefs_->SetFilePath(
         prefs::kPluginsLastInternalDirectory, cur_internal_dir);
   }
 
   bool migrate_to_pepper_flash = false;
 #if defined(OS_WIN) || defined(OS_MACOSX)
-  // If bundled NPAPI Flash is enabled while Pepper Flash is disabled, we
-  // would like to turn Pepper Flash on. And we only want to do it once.
-  // TODO(yzshen): Remove all |migrate_to_pepper_flash|-related code after it
-  // has been run once by most users. (Maybe Chrome 24 or Chrome 25.)
-  // NOTE(shess): Keep in mind that Mac is on a different schedule.
-  if (!prefs_->GetBoolean(prefs::kPluginsMigratedToPepperFlash)) {
-    prefs_->SetBoolean(prefs::kPluginsMigratedToPepperFlash, true);
+  // If NPAPI Flash is enabled while Pepper Flash is disabled, we would like to
+  // turn Pepper Flash on. And we want to do it once, when NPAPI is disabled in
+  // M45.

[Bernhard Bauer, 2015/07/27 10:08:33]

Can you add a TODO to remove this again at a defined point in time?

[Will Harris, 2015/07/27 16:08:36]

Done.

+  if (!prefs_->GetBoolean(prefs::kNpapiFlashMigratedToPepperFlash)) {
+    prefs_->SetBoolean(prefs::kNpapiFlashMigratedToPepperFlash, true);
     migrate_to_pepper_flash = true;
   }
 #endif
 
-  bool remove_component_pepper_flash_settings = false;
-  // If component-updated Pepper Flash is disabled, we would like to remove that
-  // settings item. And we only want to do it once. (Please see the comments of
-  // kPluginsRemovedOldComponentPepperFlashSettings for why.)
-  // TODO(yzshen): Remove all |remove_component_pepper_flash_settings|-related
-  // code after it has been run once by most users.
-  if (!prefs_->GetBoolean(
-          prefs::kPluginsRemovedOldComponentPepperFlashSettings)) {
-    prefs_->SetBoolean(prefs::kPluginsRemovedOldComponentPepperFlashSettings,
-                       true);
-    remove_component_pepper_flash_settings = true;
-  }
-
   {  // Scoped update of prefs::kPluginsPluginsList.
     ListPrefUpdate update(prefs_, prefs::kPluginsPluginsList);
     base::ListValue* saved_plugins_list = update.Get();
     if (saved_plugins_list && !saved_plugins_list->empty()) {
       // The following four variables are only valid when
       // |migrate_to_pepper_flash| is set to true.
       base::FilePath npapi_flash;
       base::FilePath pepper_flash;
       base::DictionaryValue* pepper_flash_node = NULL;
       bool npapi_flash_enabled = false;
       if (migrate_to_pepper_flash) {
-        PathService::Get(chrome::FILE_FLASH_PLUGIN, &npapi_flash);
+        PathService::Get(chrome::FILE_FLASH_SYSTEM_PLUGIN, &npapi_flash);
         PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &pepper_flash);
       }
 
-      // Used when |remove_component_pepper_flash_settings| is set to true.
-      base::ListValue::iterator component_pepper_flash_node =
-          saved_plugins_list->end();
-
       for (base::ListValue::iterator it = saved_plugins_list->begin();
            it != saved_plugins_list->end();
            ++it) {
         if (!(*it)->IsType(base::Value::TYPE_DICTIONARY)) {
           LOG(WARNING) << "Invalid entry in " << prefs::kPluginsPluginsList;
           continue;  // Oops, don't know what to do with this item.
         }
 
         base::DictionaryValue* plugin =
             static_cast<base::DictionaryValue*>(*it);
         base::string16 group_name;
         bool enabled;
         if (!plugin->GetBoolean("enabled", &enabled))
           enabled = true;
 
         base::FilePath::StringType path;
         // The plugin list constains all the plugin files in addition to the
         // plugin groups.
         if (plugin->GetString("path", &path)) {
           // Files have a path attribute, groups don't.
           base::FilePath plugin_path(path);
 
-          // The path to the intenral plugin directory changes everytime Chrome
+          // The path to the internal plugin directory changes everytime Chrome
           // is auto-updated, since it contains the current version number. For
           // example, it changes from foobar\Chrome\Application\21.0.1180.83 to
           // foobar\Chrome\Application\21.0.1180.89.
           // However, we would like the settings of internal plugins to persist
           // across Chrome updates. Therefore, we need to recognize those paths
           // that are within the previous internal plugin directory, and update
           // them in the prefs accordingly.
           if (update_internal_dir) {
             base::FilePath relative_path;
 
@@ skipping 18 matching lines @@
 
             // If |relative_path| is empty, |plugin_path| is not within
             // |last_internal_dir|. We don't need to update it.
             if (!relative_path.empty()) {
               plugin_path = cur_internal_dir.Append(relative_path);
               path = plugin_path.value();
               plugin->SetString("path", path);
             }
           }
 
-          if (migrate_to_pepper_flash &&
-                     base::FilePath::CompareEqualIgnoreCase(
-                         path, npapi_flash.value())) {
+          if (migrate_to_pepper_flash && base::FilePath::CompareEqualIgnoreCase(
+                                             path, npapi_flash.value())) {
             npapi_flash_enabled = enabled;
           } else if (migrate_to_pepper_flash &&
                      base::FilePath::CompareEqualIgnoreCase(
                          path, pepper_flash.value())) {
             if (!enabled)
               pepper_flash_node = plugin;
-          } else if (remove_component_pepper_flash_settings &&
-                     IsComponentUpdatedPepperFlash(plugin_path)) {
-            if (!enabled) {
-              component_pepper_flash_node = it;
-              // Skip setting |enabled| into |plugin_state_|.
-              continue;
-            }
           }
 
           plugin_state_.Set(plugin_path, enabled);
         } else if (!enabled && plugin->GetString("name", &group_name)) {
           // Otherwise this is a list of groups.
           plugin_group_state_[group_name] = false;
         }
       }
 
       if (npapi_flash_enabled && pepper_flash_node) {
         DCHECK(migrate_to_pepper_flash);
         pepper_flash_node->SetBoolean("enabled", true);
         plugin_state_.Set(pepper_flash, true);
       }
-
-      if (component_pepper_flash_node != saved_plugins_list->end()) {
-        DCHECK(remove_component_pepper_flash_settings);
-        saved_plugins_list->Erase(component_pepper_flash_node, NULL);
-      }
     } else {
       // If the saved plugin list is empty, then the call to UpdatePreferences()
       // below failed in an earlier run, possibly because the user closed the
       // browser too quickly.
 
       // Only want one PDF plugin enabled at a time. See http://crbug.com/50105
       // for background.
       plugin_group_state_[base::ASCIIToUTF16(
           PluginMetadata::kAdobeReaderGroupName)] = false;
     }
@@ skipping 101 matching lines @@
   }
 }
 
 void PluginPrefs::NotifyPluginStatusChanged() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }