| 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 def68fe8904da4860a48bd4939b49da207527a04..e6a2af1a52331f94a377d0b014feae9791870e83 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -4,6 +4,10 @@
|
|
|
| #include "chrome/browser/automation/testing_automation_provider.h"
|
|
|
| +#include <map>
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #include "app/message_box_flags.h"
|
| #include "base/command_line.h"
|
| #include "base/json/json_reader.h"
|
| @@ -2592,7 +2596,7 @@ DownloadItem* GetDownloadItemFromId(int id, DownloadManager* download_manager) {
|
| return selected_item;
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| // See PerformActionOnDownload() in chrome/test/pyautolib/pyauto.py for sample
|
| // json input and output.
|
| @@ -2981,7 +2985,7 @@ void TestingAutomationProvider::GetPluginsInfo(
|
| item->SetString("path", it->path.value());
|
| item->SetString("version", it->version);
|
| item->SetString("desc", it->desc);
|
| - item->SetBoolean("enabled", it->enabled);
|
| + 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 =
|
| @@ -3199,7 +3203,7 @@ webkit_glue::PasswordForm GetPasswordFormFromDict(
|
| return password_form;
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| // See AddSavedPassword() in chrome/test/functional/pyauto.py for sample json
|
| // input.
|
|
|