Fix Effects PPAPI whitelist on Mac and Windows

BUG=297283

Review URL: https://codereview.chromium.org/24534004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226119 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 7 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 4238481..b37dadb 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -64,10 +64,16 @@ const base::FilePath::CharType kInternalNaClPluginFileName[] =
     FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-
 const base::FilePath::CharType kEffectsPluginFileName[] =
+#if defined(OS_WIN)
+    FILE_PATH_LITERAL("pepper/libppeffects.dll");
+#elif defined(OS_MACOSX)
+    FILE_PATH_LITERAL("pepper/libppeffects.plugin");
+#else  // Linux and Chrome OS
     FILE_PATH_LITERAL("pepper/libppeffects.so");
+#endif
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 const base::FilePath::CharType kO3DPluginFileName[] =
     FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
@@ -281,6 +287,11 @@ bool PathProvider(int key, base::FilePath* result) {
         return false;
       cur = cur.Append(kInternalPDFPluginFileName);
       break;
+    case chrome::FILE_EFFECTS_PLUGIN:
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      cur = cur.Append(kEffectsPluginFileName);
+      break;
     case chrome::FILE_NACL_PLUGIN:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
@@ -333,11 +344,6 @@ bool PathProvider(int key, base::FilePath* result) {
         return false;
       cur = cur.Append(kO1DPluginFileName);
       break;
-    case chrome::FILE_EFFECTS_PLUGIN:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kEffectsPluginFileName);
-      break;
     case chrome::FILE_GTALK_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;