diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:06:45 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 17:06:45 +0000 |
| commit | 9cc493fe559c45258060464f7a892fae0cc9c16e (patch) | |
| tree | ef07d496fe314527a37b0fe45c42c1b93b01c41e /chrome/browser/automation | |
| parent | 7cf127e24d03711073a98105d9ad9f0329ddb8f4 (diff) | |
| download | chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.zip chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.tar.gz chromium_src-9cc493fe559c45258060464f7a892fae0cc9c16e.tar.bz2 | |
Speculatively revert r96364, it's the best bet on the NaCL breakage.
TEST=
BUG=
TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/7627001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index ab9ff4c..354a560 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -59,7 +59,6 @@ #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" @@ -3404,7 +3403,6 @@ 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(); @@ -3415,7 +3413,7 @@ void TestingAutomationProvider::GetPluginsInfo( item->SetString("path", it->path.value()); item->SetString("version", it->version); item->SetString("desc", it->desc); - item->SetBoolean("enabled", plugin_prefs->IsPluginEnabled(*it)); + item->SetBoolean("enabled", webkit::npapi::IsPluginEnabled(*it)); // Add info about mime types. ListValue* mime_types = new ListValue(); for (std::vector<webkit::npapi::WebPluginMimeType>::const_iterator type_it = |