| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index 274ba4d52d186330f9839e063edca783fe18b7ba..d41708ffeb82d21cab6baeaab04103d4a6092f93 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -59,6 +59,7 @@
|
| #include "chrome/browser/password_manager/password_store.h"
|
| #include "chrome/browser/password_manager/password_store_change.h"
|
| #include "chrome/browser/platform_util.h"
|
| +#include "chrome/browser/plugin_prefs.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| @@ -3410,6 +3411,7 @@ void TestingAutomationProvider::GetPluginsInfo(
|
| }
|
| std::vector<webkit::npapi::WebPluginInfo> plugins;
|
| webkit::npapi::PluginList::Singleton()->GetPlugins(&plugins);
|
| + PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(browser->profile());
|
| ListValue* items = new ListValue;
|
| for (std::vector<webkit::npapi::WebPluginInfo>::const_iterator it =
|
| plugins.begin();
|
| @@ -3420,7 +3422,7 @@ void TestingAutomationProvider::GetPluginsInfo(
|
| item->SetString("path", it->path.value());
|
| item->SetString("version", it->version);
|
| item->SetString("desc", it->desc);
|
| - item->SetBoolean("enabled", webkit::npapi::IsPluginEnabled(*it));
|
| + item->SetBoolean("enabled", plugin_prefs->IsPluginEnabled(*it));
|
| // Add info about mime types.
|
| ListValue* mime_types = new ListValue();
|
| for (std::vector<webkit::npapi::WebPluginMimeType>::const_iterator type_it =
|
|
|