One-time migration of NPAPI Flash to PPAPI Flash.

chrome/common/chrome_content_client.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/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 290 matching lines @@
   if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path))
     return false;
 
   *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING);
   return true;
 #else
   return false;
 #endif  // FLAPPER_AVAILABLE
 }
 
-#if defined(OS_WIN)
-const char kPepperFlashDLLBaseName[] =
-#if defined(ARCH_CPU_X86)
-    "pepflashplayer32_";
-#elif defined(ARCH_CPU_X86_64)
-    "pepflashplayer64_";
-#else
-#error Unsupported Windows CPU architecture.
-#endif  // defined(ARCH_CPU_X86)
-#endif  // defined(OS_WIN)
-
 #if defined(FLAPPER_AVAILABLE)
 bool IsSystemFlashScriptDebuggerPresent() {
 #if defined(OS_WIN)
   const wchar_t kFlashRegistryRoot[] =
       L"SOFTWARE\\Macromedia\\FlashPlayerPepper";
   const wchar_t kIsDebuggerValueName[] = L"isScriptDebugger";
 
   base::win::RegKey path_key(HKEY_LOCAL_MACHINE, kFlashRegistryRoot, KEY_READ);
   DWORD debug_value;
   if (FAILED(path_key.ReadValueDW(kIsDebuggerValueName, &debug_value)))
@@ skipping 17 matching lines @@
   if (!command_line->HasSwitch(switches::kDisableBundledPpapiFlash) &&
       !IsSystemFlashScriptDebuggerPresent())
     return false;
 #endif  // defined(FLAPPER_AVAILABLE)
 
   // Do not try and find System Pepper Flash if there is a specific path on
   // the commmand-line.
   if (command_line->HasSwitch(switches::kPpapiFlashPath))
     return false;
 
-  base::FilePath flash_path;
-  if (!PathService::Get(chrome::DIR_PEPPER_FLASH_SYSTEM_PLUGIN, &flash_path))
+  base::FilePath flash_filename;
+  if (!PathService::Get(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
+                        &flash_filename))
     return false;
 
-  if (!base::PathExists(flash_path))
+  if (!base::PathExists(flash_filename))
     return false;
 
-  base::FilePath manifest_path(flash_path.AppendASCII("manifest.json"));
+  base::FilePath manifest_path(
+      flash_filename.DirName().AppendASCII("manifest.json"));
 
   std::string manifest_data;
   if (!base::ReadFileToString(manifest_path, &manifest_data))
     return false;
   scoped_ptr<base::Value> manifest_value(
       base::JSONReader::Read(manifest_data, base::JSON_ALLOW_TRAILING_COMMAS));
   if (!manifest_value.get())
     return false;
   base::DictionaryValue* manifest = NULL;
   if (!manifest_value->GetAsDictionary(&manifest))
     return false;
 
   Version version;
   if (!chrome::CheckPepperFlashManifest(*manifest, &version))
     return false;
 
-#if defined(OS_WIN)
-  // PepperFlash DLLs on Windows look like basename_v_x_y_z.dll.
-  std::string filename(kPepperFlashDLLBaseName);
-  filename.append(version.GetString());
-  base::ReplaceChars(filename, ".", "_", &filename);
-  filename.append(".dll");
-
-  base::FilePath path(flash_path.Append(base::ASCIIToUTF16(filename)));
-#else
-  // PepperFlash on OS X is called PepperFlashPlayer.plugin
-  base::FilePath path(flash_path.Append(chrome::kPepperFlashPluginFilename));
-#endif
-
-  if (!base::PathExists(path))
-    return false;
-
-  *plugin = CreatePepperFlashInfo(path, version.GetString());
+  *plugin = CreatePepperFlashInfo(flash_filename, version.GetString());
   return true;
 }
 #endif  //  defined(ENABLE_PLUGINS)
 
 std::string GetProduct() {
   chrome::VersionInfo version_info;
   return version_info.ProductNameAndVersionForUserAgent();
 }
 
 }  // namespace
@@ skipping 165 matching lines @@
 #endif
 
 void ChromeContentClient::AddSecureSchemesAndOrigins(
     std::set<std::string>* schemes,
     std::set<GURL>* origins) {
   schemes->insert(content::kChromeUIScheme);
   schemes->insert(extensions::kExtensionScheme);
   schemes->insert(extensions::kExtensionResourceScheme);
   GetSecureOriginWhitelist(origins);
 }