| Index: chrome/browser/extensions/plugin_manager.cc
|
| diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
|
| index 86bbe93ca3550ddcf984ed3515a370d6be9a6b50..8d979f2fa8a1ca99c06a91375a3622cf58f7e7bc 100644
|
| --- a/chrome/browser/extensions/plugin_manager.cc
|
| +++ b/chrome/browser/extensions/plugin_manager.cc
|
| @@ -19,12 +19,12 @@
|
| #include "extensions/common/extension.h"
|
| #include "url/gurl.h"
|
|
|
| -using content::PluginService;
|
| -
|
| #if !defined(DISABLE_NACL)
|
| -static const char kNaClPluginMimeType[] = "application/x-nacl";
|
| +#include "components/nacl/common/nacl_constants.h"
|
| #endif
|
|
|
| +using content::PluginService;
|
| +
|
| namespace extensions {
|
|
|
| PluginManager::PluginManager(content::BrowserContext* context)
|
| @@ -184,7 +184,7 @@ void PluginManager::UpdatePluginListWithNaClModules() {
|
| // Check each MIME type the plugins handle for the NaCl MIME type.
|
| for (mime_iter = pepper_info->mime_types.begin();
|
| mime_iter != pepper_info->mime_types.end(); ++mime_iter) {
|
| - if (mime_iter->mime_type == kNaClPluginMimeType) {
|
| + if (mime_iter->mime_type == nacl::kNaClPluginMimeType) {
|
| // This plugin handles "application/x-nacl".
|
|
|
| PluginService::GetInstance()->UnregisterInternalPlugin(pepper_info->path);
|
|
|