| Index: chrome/browser/ui/webui/web_ui_browsertest.h
|
| diff --git a/chrome/browser/ui/webui/web_ui_browsertest.h b/chrome/browser/ui/webui/web_ui_browsertest.h
|
| index 5e483e6d69f3c90ef6b8cca33f9275c31e659fe0..fa84ef11df024d748c000d254bd7dba763f4dbcf 100644
|
| --- a/chrome/browser/ui/webui/web_ui_browsertest.h
|
| +++ b/chrome/browser/ui/webui/web_ui_browsertest.h
|
| @@ -72,6 +72,17 @@ class WebUIBrowserTest
|
| bool RunJavascriptTest(const std::string& test_name,
|
| const ConstValueVector& test_arguments);
|
|
|
| + // Runs a test that may include calls to functions in test_api.js, and waits
|
| + // for call to asyncTestDone().
|
| + bool RunJavascriptAsyncTest(const std::string& test_name);
|
| + bool RunJavascriptAsyncTest(const std::string& test_name,
|
| + const base::Value& arg);
|
| + bool RunJavascriptAsyncTest(const std::string& test_name,
|
| + const base::Value& arg1,
|
| + const base::Value& arg2);
|
| + bool RunJavascriptAsyncTest(const std::string& test_name,
|
| + const ConstValueVector& test_arguments);
|
| +
|
| // Sends message through |preload_host| to preload javascript libraries and
|
| // sets the |libraries_preloaded| flag to prevent re-loading at next
|
| // javascript invocation.
|
| @@ -126,10 +137,12 @@ class WebUIBrowserTest
|
| // logging an error message on failure, otherwise |function_name| is called
|
| // asynchronously. When |preload_host| is non-NULL, sends the javascript to
|
| // the RenderView for evaluation at the appropriate time before the onload
|
| - // call is made.
|
| + // call is made. When |is_async| is true, waits for asyncTestDone() in
|
| + // javascript code.
|
| bool RunJavascriptUsingHandler(const std::string& function_name,
|
| const ConstValueVector& function_arguments,
|
| bool is_test,
|
| + bool is_async,
|
| RenderViewHost* preload_host);
|
|
|
| // Attaches mock and test handlers.
|
|
|