Prefer System Flash over non-local component updated Flash.

chrome/browser/ui/webui/plugins/plugins_handler.cc

 // Copyright 2016 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/plugins_handler.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/pepper_flash.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_constants.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 34 matching lines @@
   // description as the system plugin to help the user disambiguate the
   // two plugins.
   base::string16 desc = plugin.desc;
   if (plugin.is_pepper_plugin() &&
       plugin.name == base::ASCIIToUTF16(content::kFlashPluginName)) {
     base::FilePath system_flash_path;
     PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
                      &system_flash_path);
     if (base::FilePath::CompareEqualIgnoreCase(plugin.path.value(),
                                                system_flash_path.value())) {
-#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
+      if (chrome::IsSystemFlashScriptDebuggerPresent())
+        desc += base::ASCIIToUTF16(" Debug");
+      else
+        desc += base::ASCIIToUTF16(" System");
     }
   }
   return desc;
 }
 
 mojo::Array<mojom::MimeTypePtr> GeneratePluginMimeTypes(
     const WebPluginInfo& plugin) {
   mojo::Array<mojom::MimeTypePtr> mime_types;
   for (const auto& plugin_mime_type : plugin.mime_types) {
     mojom::MimeTypePtr mime_type(mojom::MimeType::New());
@@ skipping 258 matching lines @@
   }
 
   if (plugins_enabled_by_policy)
     return "enabledByPolicy";
   if (plugins_disabled_by_policy)
     return "disabledByPolicy";
   if (plugins_managed_by_policy)
     return "managedByPolicy";
   return group_enabled ? "enabledByUser" : "disabledByUser";
 }