| Index: chrome/test/webdriver/webdriver_session.h
|
| diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h
|
| index c4edae8665e43c72f750a140e05116ba039e6ff9..a9af2bd019517107d55c846a428402d8fa7735f2 100644
|
| --- a/chrome/test/webdriver/webdriver_session.h
|
| +++ b/chrome/test/webdriver/webdriver_session.h
|
| @@ -9,6 +9,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| +#include "base/callback_forward.h"
|
| #include "base/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/string16.h"
|
| @@ -307,7 +308,13 @@ class Session {
|
| Error* WaitForAllTabsToStopLoading();
|
|
|
| // Install packed extension at |path|.
|
| - Error* InstallExtension(const FilePath& path);
|
| + Error* InstallExtensionDeprecated(const FilePath& path);
|
| +
|
| + // Get installed extensions IDs.
|
| + Error* GetInstalledExtensions(std::vector<std::string>* extension_ids);
|
| +
|
| + // Install extension at |path|.
|
| + Error* InstallExtension(const FilePath& path, std::string* extension_id);
|
|
|
| const std::string& id() const;
|
|
|
| @@ -334,6 +341,10 @@ class Session {
|
| void RunSessionTaskOnSessionThread(
|
| Task* task,
|
| base::WaitableEvent* done_event);
|
| + void RunSessionTask(const base::Closure& task);
|
| + void RunClosureOnSessionThread(
|
| + const base::Closure& task,
|
| + base::WaitableEvent* done_event);
|
| void InitOnSessionThread(const Automation::BrowserOptions& options,
|
| Error** error);
|
| void TerminateOnSessionThread();
|
|
|