| Index: chrome/browser/automation/testing_automation_provider.cc
|
| ===================================================================
|
| --- chrome/browser/automation/testing_automation_provider.cc (revision 212806)
|
| +++ chrome/browser/automation/testing_automation_provider.cc (working copy)
|
| @@ -139,6 +139,7 @@
|
| #include "content/public/common/drop_data.h"
|
| #include "content/public/common/geoposition.h"
|
| #include "content/public/common/ssl_status.h"
|
| +#include "content/public/common/webplugininfo.h"
|
| #include "extensions/browser/view_type_utils.h"
|
| #include "extensions/common/url_pattern.h"
|
| #include "extensions/common/url_pattern_set.h"
|
| @@ -147,7 +148,6 @@
|
| #include "ui/base/events/event_constants.h"
|
| #include "ui/base/keycodes/keyboard_codes.h"
|
| #include "ui/base/ui_base_types.h"
|
| -#include "webkit/plugins/webplugininfo.h"
|
|
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| #include "chrome/browser/policy/policy_service.h"
|
| @@ -3058,11 +3058,11 @@
|
| Browser* browser,
|
| DictionaryValue* args,
|
| IPC::Message* reply_message,
|
| - const std::vector<webkit::WebPluginInfo>& plugins) {
|
| + const std::vector<content::WebPluginInfo>& plugins) {
|
| PluginPrefs* plugin_prefs =
|
| PluginPrefs::GetForProfile(browser->profile()).get();
|
| ListValue* items = new ListValue;
|
| - for (std::vector<webkit::WebPluginInfo>::const_iterator it =
|
| + for (std::vector<content::WebPluginInfo>::const_iterator it =
|
| plugins.begin();
|
| it != plugins.end();
|
| ++it) {
|
| @@ -3074,7 +3074,7 @@
|
| item->SetBoolean("enabled", plugin_prefs->IsPluginEnabled(*it));
|
| // Add info about mime types.
|
| ListValue* mime_types = new ListValue();
|
| - for (std::vector<webkit::WebPluginMimeType>::const_iterator type_it =
|
| + for (std::vector<content::WebPluginMimeType>::const_iterator type_it =
|
| it->mime_types.begin();
|
| type_it != it->mime_types.end();
|
| ++type_it) {
|
|
|