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

chrome/browser/component_updater/pepper_flash_component_installer.cc

Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 485a758965ebdf046fde0694d668d46aa81c1833..529a0368bfba1a4907c5bb67f33e85c697f65718 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -15,20 +15,18 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/flash_component_installer.h"
-#include "chrome/browser/component_updater/ppapi_utils.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pepper_flash.h"
+#include "chrome/common/ppapi_utils.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/update_client/update_client.h"
 #include "content/public/browser/browser_thread.h"
@@ -36,7 +34,6 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.  NOLINT
-#include "ppapi/c/private/ppb_pdf.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 using content::BrowserThread;
@@ -46,9 +43,6 @@ namespace component_updater {
 
 namespace {
 
-// File name of the Pepper Flash component manifest on different platforms.
-const char kPepperFlashManifestName[] = "Flapper";
-
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
 const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
@@ -61,26 +55,6 @@ const char kNullVersion[] = "0.0.0.0";
 
 #endif  // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 
-// Name of the Pepper Flash OS in the component manifest.
-const char kPepperFlashOperatingSystem[] =
-#if defined(OS_MACOSX)
-    "mac";
-#elif defined(OS_WIN)
-    "win";
-#else  // OS_LINUX, etc. TODO(viettrungluu): Separate out Chrome OS and Android?
-    "linux";
-#endif
-
-// Name of the Pepper Flash architecture in the component manifest.
-const char kPepperFlashArch[] =
-#if defined(ARCH_CPU_X86)
-    "ia32";
-#elif defined(ARCH_CPU_X86_64)
-    "x64";
-#else  // TODO(viettrungluu): Support an ARM check?
-    "???";
-#endif
-
 // The base directory on Windows looks like:
 // <profile>\AppData\Local\Google\Chrome\User Data\PepperFlash\.
 base::FilePath GetPepperFlashBaseDirectory() {
@@ -90,15 +64,6 @@ base::FilePath GetPepperFlashBaseDirectory() {
 }
 
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
-// Install directory for pepper flash debugger dlls will be like
-// c:\windows\system32\macromed\flash\, or basically the Macromed\Flash
-// subdirectory of the Windows system directory.
-base::FilePath GetPepperFlashDebuggerDirectory() {
-  base::FilePath result;
-  PathService::Get(chrome::DIR_PEPPER_FLASH_DEBUGGER_PLUGIN, &result);
-  return result;
-}
-
 // Pepper Flash plugins have the version encoded in the path itself
 // so we need to enumerate the directories to find the full path.
 // On success, |latest_dir| returns something like:
@@ -134,85 +99,11 @@ bool GetPepperFlashDirectory(base::FilePath* latest_dir,
   }
   return found;
 }
-
-#if defined(OS_WIN)
-const wchar_t kPepperFlashDebuggerDLLSearchString[] =
-#if defined(ARCH_CPU_X86)
-    L"pepflashplayer32*.dll";
-#elif defined(ARCH_CPU_X86_64)
-    L"pepflashplayer64*.dll";
-#else
-#error Unsupported Windows CPU architecture.
-#endif  // defined(ARCH_CPU_X86)
-#endif  // defined(OS_WIN)
-
-bool GetPepperFlashDebuggerPath(base::FilePath* dll_path,
-                                Version* dll_version) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-  base::FilePath debugger_dir = GetPepperFlashDebuggerDirectory();
-  // If path doesn't exist they simply don't have the flash debugger installed.
-  if (!base::PathExists(debugger_dir))
-    return false;
-
-  bool found = false;
-#if defined(OS_WIN)
-  // Enumerate any DLLs that match the appropriate pattern for this DLL, and
-  // pick the highest version number we find.
-  base::FileEnumerator file_enumerator(debugger_dir,
-                                       false,
-                                       base::FileEnumerator::FILES,
-                                       kPepperFlashDebuggerDLLSearchString);
-  for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
-       path = file_enumerator.Next()) {
-    // Version number is embedded in file name like basename_x_y_z.dll. Extract.
-    std::string file_name(path.BaseName().RemoveExtension().MaybeAsASCII());
-    // file_name should now be basename_x_y_z. Split along '_' for version.
-    std::vector<std::string> components;
-    base::SplitString(file_name, '_', &components);
-    // Should have at least one version number.
-    if (components.size() <= 1)
-      continue;
-    // Meld version components back into a string, now separated by periods, so
-    // Version can parse it.
-    std::string version_string(components[1]);
-    for (size_t i = 2; i < components.size(); ++i) {
-      version_string += "." + components[i];
-    }
-    Version version(version_string);
-    if (!version.IsValid())
-      continue;
-    if (found) {
-      if (version.CompareTo(*dll_version) > 0) {
-        *dll_path = path;
-        *dll_version = version;
-      }
-    } else {
-      *dll_path = path;
-      *dll_version = version;
-      found = true;
-    }
-  }
-#endif
-  return found;
-}
 #endif  // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 
-// Returns true if the Pepper |interface_name| is implemented  by this browser.
-// It does not check if the interface is proxied.
-bool SupportsPepperInterface(const char* interface_name) {
-  if (IsSupportedPepperInterface(interface_name))
-    return true;
-  // The PDF interface is invisible to SupportsInterface() on the browser
-  // process because it is provided using PpapiInterfaceFactoryManager. We need
-  // to check for that as well.
-  // TODO(cpu): make this more sane.
-  return (strcmp(interface_name, PPB_PDF_INTERFACE) == 0);
-}
-
 bool MakePepperFlashPluginInfo(const base::FilePath& flash_path,
                                const Version& flash_version,
                                bool out_of_process,
-                               bool is_debugger,
                                content::PepperPluginInfo* plugin_info) {
   if (!flash_version.IsValid())
     return false;
@@ -224,7 +115,7 @@ bool MakePepperFlashPluginInfo(const base::FilePath& flash_path,
   plugin_info->is_out_of_process = out_of_process;
   plugin_info->path = flash_path;
   plugin_info->name = content::kFlashPluginName;
-  plugin_info->permissions = kPepperFlashPermissions;
+  plugin_info->permissions = chrome::kPepperFlashPermissions;
 
   // The description is like "Shockwave Flash 10.2 r154".
   plugin_info->description = base::StringPrintf("%s %d.%d r%d",
@@ -255,80 +146,38 @@ bool IsPepperFlash(const content::WebPluginInfo& plugin) {
 }
 
 void RegisterPepperFlashWithChrome(const base::FilePath& path,
-                                   const Version& version,
-                                   bool is_debugger) {
+                                   const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   content::PepperPluginInfo plugin_info;
-  if (!MakePepperFlashPluginInfo(
-          path, version, true, is_debugger, &plugin_info))
+  if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
 
-  // If this is the non-debugger version, we enumerate any installed versions of
-  // pepper flash to make sure we only replace the installed version with a
-  // newer version.
-  if (!is_debugger) {
-    std::vector<content::WebPluginInfo> plugins;
-    PluginService::GetInstance()->GetInternalPlugins(&plugins);
-    for (std::vector<content::WebPluginInfo>::const_iterator it =
-             plugins.begin();
-         it != plugins.end();
-         ++it) {
-      if (!IsPepperFlash(*it))
-        continue;
-
-      // Do it only if the version we're trying to register is newer.
-      Version registered_version(base::UTF16ToUTF8(it->version));
-      if (registered_version.IsValid() &&
-          version.CompareTo(registered_version) <= 0) {
-        return;
-      }
+  std::vector<content::WebPluginInfo> plugins;
+  PluginService::GetInstance()->GetInternalPlugins(&plugins);
+  for (std::vector<content::WebPluginInfo>::const_iterator it =
+            plugins.begin();
+        it != plugins.end();
+        ++it) {
+    if (!IsPepperFlash(*it))
+      continue;
 
-      // If the version is newer, remove the old one first.
-      PluginService::GetInstance()->UnregisterInternalPlugin(it->path);
-      break;
+    // Do it only if the version we're trying to register is newer.
+    Version registered_version(base::UTF16ToUTF8(it->version));
+    if (registered_version.IsValid() &&
+        version.CompareTo(registered_version) <= 0) {
+      return;
     }
+
+    // If the version is newer, remove the old one first.
+    PluginService::GetInstance()->UnregisterInternalPlugin(it->path);
+    break;
   }
 
-  // We only ask for registration at the beginning for the non-debugger plugin,
-  // that way the debugger plugin doesn't automatically clobber the built-in or
-  // updated non-debugger version.
   PluginService::GetInstance()->RegisterInternalPlugin(
-      plugin_info.ToWebPluginInfo(), !is_debugger);
+      plugin_info.ToWebPluginInfo(), true);
   PluginService::GetInstance()->RefreshPlugins();
 }
 
-// Returns true if this browser implements one of the interfaces given in
-// |interface_string|, which is a '|'-separated string of interface names.
-bool CheckPepperFlashInterfaceString(const std::string& interface_string) {
-  std::vector<std::string> interface_names;
-  base::SplitString(interface_string, '|', &interface_names);
-  for (size_t i = 0; i < interface_names.size(); i++) {
-    if (SupportsPepperInterface(interface_names[i].c_str()))
-      return true;
-  }
-  return false;
-}
-
-// Returns true if this browser implements all the interfaces that Flash
-// specifies in its component installer manifest.
-bool CheckPepperFlashInterfaces(const base::DictionaryValue& manifest) {
-  const base::ListValue* interface_list = NULL;
-
-  // We don't *require* an interface list, apparently.
-  if (!manifest.GetList("x-ppapi-required-interfaces", &interface_list))
-    return true;
-
-  for (size_t i = 0; i < interface_list->GetSize(); i++) {
-    std::string interface_string;
-    if (!interface_list->GetString(i, &interface_string))
-      return false;
-    if (!CheckPepperFlashInterfaceString(interface_string))
-      return false;
-  }
-
-  return true;
-}
-
 }  // namespace
 
 class PepperFlashComponentInstaller : public update_client::ComponentInstaller {
@@ -366,7 +215,7 @@ bool PepperFlashComponentInstaller::Install(
     const base::DictionaryValue& manifest,
     const base::FilePath& unpack_path) {
   Version version;
-  if (!CheckPepperFlashManifest(manifest, &version))
+  if (!chrome::CheckPepperFlashManifest(manifest, &version))
     return false;
   if (current_version_.CompareTo(version) > 0)
     return false;
@@ -387,7 +236,7 @@ bool PepperFlashComponentInstaller::Install(
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
-      base::Bind(&RegisterPepperFlashWithChrome, path, version, false));
+      base::Bind(&RegisterPepperFlashWithChrome, path, version));
   return true;
 }
 
@@ -401,44 +250,7 @@ bool PepperFlashComponentInstaller::Uninstall() {
   return false;
 }
 
-bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
-                              Version* version_out) {
-  std::string name;
-  manifest.GetStringASCII("name", &name);
-  // TODO(viettrungluu): Support WinFlapper for now, while we change the format
-  // of the manifest. (Should be safe to remove checks for "WinFlapper" in, say,
-  // Nov. 2011.)  crbug.com/98458
-  if (name != kPepperFlashManifestName && name != "WinFlapper")
-    return false;
 
-  std::string proposed_version;
-  manifest.GetStringASCII("version", &proposed_version);
-  Version version(proposed_version.c_str());
-  if (!version.IsValid())
-    return false;
-
-  if (!CheckPepperFlashInterfaces(manifest))
-    return false;
-
-  // TODO(viettrungluu): See above TODO.
-  if (name == "WinFlapper") {
-    *version_out = version;
-    return true;
-  }
-
-  std::string os;
-  manifest.GetStringASCII("x-ppapi-os", &os);
-  if (os != kPepperFlashOperatingSystem)
-    return false;
-
-  std::string arch;
-  manifest.GetStringASCII("x-ppapi-arch", &arch);
-  if (arch != kPepperFlashArch)
-    return false;
-
-  *version_out = version;
-  return true;
-}
 
 namespace {
 
@@ -474,7 +286,7 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
       BrowserThread::PostTask(
           BrowserThread::UI,
           FROM_HERE,
-          base::Bind(&RegisterPepperFlashWithChrome, path, version, false));
+          base::Bind(&RegisterPepperFlashWithChrome, path, version));
     } else {
       version = Version(kNullVersion);
     }
@@ -491,18 +303,6 @@ void StartPepperFlashUpdateRegistration(ComponentUpdateService* cus) {
        ++iter) {
     base::DeleteFile(*iter, true);
   }
-
-  // Check for Debugging version of Flash and register if present.
-  base::FilePath debugger_path;
-  Version debugger_version(kNullVersion);
-  if (GetPepperFlashDebuggerPath(&debugger_path, &debugger_version)) {
-    BrowserThread::PostTask(BrowserThread::UI,
-                            FROM_HERE,
-                            base::Bind(&RegisterPepperFlashWithChrome,
-                                       debugger_path,
-                                       debugger_version,
-                                       true));
-  }
 }
 #endif  // defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)