One-time migration of NPAPI Flash to PPAPI Flash.

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 358 matching lines @@
       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 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 system_path;
-        PathService::Get(chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN, &system_path);
-        if (group_plugin.path.DirName() == system_path) {
+        base::FilePath system_flash_path;
+        PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+                         &system_flash_path);
+        if (base::FilePath::CompareEqualIgnoreCase(group_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
         }
       }
@@ skipping 127 matching lines @@
 }
 
 // static
 void PluginsUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kPluginsShowDetails, false);
   registry->RegisterDictionaryPref(
       prefs::kContentSettingsPluginWhitelist,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }