Register system Pepper Flash plugin if no packaged Pepper plugin is found.

chrome/browser/ui/webui/plugins_ui.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/ui/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 354 matching lines @@
     bool all_plugins_disabled_by_policy = true;
     bool all_plugins_managed_by_policy = true;
     const WebPluginInfo* active_plugin = NULL;
     for (size_t j = 0; j < group_plugins.size(); ++j) {
       const WebPluginInfo& group_plugin = *group_plugins[j];
 
       base::DictionaryValue* plugin_file = new base::DictionaryValue();
       plugin_file->SetString("name", group_plugin.name);
 
       // If this plugin is Pepper Flash, and the plugin path is the same as the
-      // path for the Pepper Flash Debugger plugin, then mark this plugin
-      // description as the debugger plugin to help the user disambiguate the
+      // path for the Pepper Flash System plugin, then mark this plugin
+      // description as the system plugin to help the user disambiguate the
       // two plugins.
       base::string16 desc = group_plugin.desc;
       if (group_plugin.is_pepper_plugin() &&
           group_plugin.name == base::ASCIIToUTF16(content::kFlashPluginName)) {
-        base::FilePath debug_path;
-        PathService::Get(chrome::DIR_PEPPER_FLASH_DEBUGGER_PLUGIN, &debug_path);
-        if (group_plugin.path.DirName() == debug_path)
+        base::FilePath system_path;
+        PathService::Get(chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN, &system_path);
+        if (group_plugin.path.DirName() == system_path) {
+#if defined(GOOGLE_CHROME_BUILD)
+          // Existing documentation for debugging Flash describe this plugin as
+          // "Debug" so preserve this nomenclature here.
           desc += base::ASCIIToUTF16(" Debug");
+#else
+          // On Chromium, we can name it what it really is; the system plugin.
+          desc += base::ASCIIToUTF16(" System");
+#endif
+        }
       }
       plugin_file->SetString("description", desc);
 
       plugin_file->SetString("path", group_plugin.path.value());
       plugin_file->SetString("version", group_plugin.version);
       plugin_file->SetString("type", PluginTypeToString(group_plugin.type));
 
       base::ListValue* mime_types = new base::ListValue();
       const std::vector<content::WebPluginMimeType>& plugin_mime_types =
           group_plugin.mime_types;
@@ skipping 121 matching lines @@
 void PluginsUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kPluginsShowDetails,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDictionaryPref(
       prefs::kContentSettingsPluginWhitelist,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }