| 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 c6570da6b3d78d2431cfdc85173afc3938d03167..8153481996621acfe6e0e2d29694218d30f3b385 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"
|
| @@ -2638,7 +2642,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.
|
| @@ -3061,7 +3065,8 @@ void TestingAutomationProvider::DisablePlugin(Browser* browser,
|
| if (!args->GetString("path", &path)) {
|
| reply.SendError("path not specified.");
|
| return;
|
| - } else if (!NPAPI::PluginList::Singleton()->DisablePlugin(FilePath(path))) {
|
| + } else if (!NPAPI::PluginList::Singleton()->DisablePlugin(
|
| + FilePath(path), false)) {
|
| reply.SendError(StringPrintf("Could not disable plugin for path %s.",
|
| path.c_str()));
|
| return;
|
| @@ -3216,7 +3221,7 @@ webkit_glue::PasswordForm GetPasswordFormFromDict(
|
| return password_form;
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| // See AddSavedPassword() in chrome/test/functional/pyauto.py for sample json
|
| // input.
|
|
|