| Index: chrome/browser/chrome_plugin_service_filter.cc
|
| diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/chrome_plugin_service_filter.cc
|
| index a5a1a0ea41576772a14b2c74d6e2d637e2e91f37..68afe0deec52781ec4edaab44cc121ff6ef18bb2 100644
|
| --- a/chrome/browser/chrome_plugin_service_filter.cc
|
| +++ b/chrome/browser/chrome_plugin_service_filter.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "chrome/browser/plugin_metadata.h"
|
| #include "chrome/browser/plugin_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_notification_types.h"
|
| @@ -14,13 +15,10 @@
|
| #include "content/public/browser/plugin_service.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/resource_context.h"
|
| -#include "webkit/plugins/npapi/plugin_group.h"
|
| #include "webkit/plugins/npapi/plugin_list.h"
|
|
|
| using content::BrowserThread;
|
| using content::PluginService;
|
| -using webkit::npapi::PluginGroup;
|
| -
|
| // static
|
| ChromePluginServiceFilter* ChromePluginServiceFilter::GetInstance() {
|
| return Singleton<ChromePluginServiceFilter>::get();
|
| @@ -87,7 +85,7 @@ bool ChromePluginServiceFilter::ShouldUsePlugin(
|
|
|
| bool use = overridden_plugins_[i].plugin_name == plugin->name;
|
| if (use &&
|
| - plugin->name == ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName)) {
|
| + plugin->name == ASCIIToUTF16(PluginMetadata::kAdobeReaderGroupName)) {
|
| // If the caller is forcing the Adobe Reader plugin, then don't show the
|
| // blocked plugin UI if it's vulnerable.
|
| plugin->version = ASCIIToUTF16("11.0.0.0");
|
|
|