Remove bundled NPAPI Flash on Windows.

chrome/browser/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/plugin_prefs.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_prefs_factory.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 369 matching lines @@
   PathService::Get(chrome::FILE_NACL_PLUGIN, &nacl_path);
   FilePath::StringType nacl_path_str = nacl_path.value();
   if (!prefs_->GetBoolean(prefs::kPluginsEnabledNaCl)) {
     // We switched to the nacl plugin being on by default, and so we need to
     // force it to be enabled.  We only want to do it this once though, i.e.
     // we don't want to enable it again if the user disables it afterwards.
     prefs_->SetBoolean(prefs::kPluginsEnabledNaCl, true);
     force_enable_nacl = true;
   }
 
+  bool migrate_to_pepper_flash = false;
+#if defined(OS_WIN)
+  // If bundled NPAPI Flash is enabled while Peppper 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.)
+  if (!prefs_->GetBoolean(prefs::kPluginsMigratedToPepperFlash)) {
+    prefs_->SetBoolean(prefs::kPluginsMigratedToPepperFlash, true);
+    migrate_to_pepper_flash = true;
+  }
+#endif
+
   {  // Scoped update of prefs::kPluginsPluginsList.
     ListPrefUpdate update(prefs_, prefs::kPluginsPluginsList);
     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.
+      FilePath npapi_flash;
+      FilePath pepper_flash;
+      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_PEPPER_FLASH_PLUGIN, &pepper_flash);
+      }
+
       for (ListValue::const_iterator it = saved_plugins_list->begin();
            it != saved_plugins_list->end();
            ++it) {
         if (!(*it)->IsType(Value::TYPE_DICTIONARY)) {
           LOG(WARNING) << "Invalid entry in " << prefs::kPluginsPluginsList;
           continue;  // Oops, don't know what to do with this item.
         }
 
         DictionaryValue* plugin = static_cast<DictionaryValue*>(*it);
         string16 group_name;
@@ skipping 22 matching lines @@
               enabled = true;
               plugin->SetBoolean("enabled", true);
             }
 
             internal_pdf_enabled = enabled;
           } else if (FilePath::CompareIgnoreCase(path, nacl_path_str) == 0) {
             if (!enabled && force_enable_nacl) {
               enabled = true;
               plugin->SetBoolean("enabled", true);
             }
+          } else if (migrate_to_pepper_flash &&
+              FilePath::CompareEqualIgnoreCase(path, npapi_flash.value())) {
+            npapi_flash_enabled = enabled;
+          } else if (migrate_to_pepper_flash &&
+              FilePath::CompareEqualIgnoreCase(path, pepper_flash.value())) {
+            if (!enabled)
+              pepper_flash_node = plugin;
           }
 
           plugin_state_[plugin_path] = enabled;
         } else if (!enabled && plugin->GetString("name", &group_name)) {
           // Don't disable this group if it's for the pdf or nacl plugins and
           // we just forced it on.
           if (force_enable_internal_pdf && pdf_group_name == group_name)
             continue;
           if (force_enable_nacl && (nacl_group_name == group_name ||
                                     old_nacl_group_name == group_name))
             continue;
 
           // 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_[pepper_flash] = true;
+      }
     } 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. Try to force enable the internal PDF and nacl
       // plugins again.
       force_enable_internal_pdf = true;
       force_enable_nacl = true;
     }
   }  // Scoped update of prefs::kPluginsPluginsList.
 
@@ skipping 127 matching lines @@
   }
 }
 
 void PluginPrefs::NotifyPluginStatusChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }