| Index: chrome/common/chrome_paths.cc
|
| diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
|
| index df5df2fa479feaa878185b5847e23e1d9066bc0d..63972ea55e277e92b87fd0e76b1bd98406ed0828 100644
|
| --- a/chrome/common/chrome_paths.cc
|
| +++ b/chrome/common/chrome_paths.cc
|
| @@ -60,16 +60,8 @@ const base::FilePath::CharType kInternalPDFPluginFileName[] =
|
| FILE_PATH_LITERAL("libpdf.so");
|
| #endif
|
|
|
| -// File name of the internal NaCl plugin on different platforms.
|
| const base::FilePath::CharType kInternalNaClPluginFileName[] =
|
| -#if defined(OS_WIN)
|
| - FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
|
| -#elif defined(OS_MACOSX)
|
| - // TODO(noelallen) Please verify this extention name is correct.
|
| - FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
|
| -#else // Linux and Chrome OS
|
| - FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
|
| -#endif
|
| + FILE_PATH_LITERAL("internal-nacl-plugin");
|
|
|
| const base::FilePath::CharType kEffectsPluginFileName[] =
|
| #if defined(OS_WIN)
|
| @@ -312,6 +304,9 @@ bool PathProvider(int key, base::FilePath* result) {
|
| return false;
|
| cur = cur.Append(kEffectsPluginFileName);
|
| break;
|
| + // TODO(teravest): Remove this case once the internal NaCl plugin is gone.
|
| + // We currently need a path here to look up whether the plugin is disabled
|
| + // and what its permissions are.
|
| case chrome::FILE_NACL_PLUGIN:
|
| if (!GetInternalPluginsDirectory(&cur))
|
| return false;
|
|
|