Index: chrome/test/remoting/remote_desktop_browsertest.h |
diff --git a/chrome/test/remoting/remote_desktop_browsertest.h b/chrome/test/remoting/remote_desktop_browsertest.h |
index 7ec09817c82b90a1f644b3595142b52d4d2cb76a..e5d91a49f9c53c279562e248ad6cb51033b2ffa3 100644 |
--- a/chrome/test/remoting/remote_desktop_browsertest.h |
+++ b/chrome/test/remoting/remote_desktop_browsertest.h |
@@ -92,6 +92,8 @@ class RemoteDesktopBrowserTest : public extensions::PlatformAppBrowserTest { |
// JavaScript in the context of the app between these two calls, for example |
// to set up appropriate mocks. |
void LaunchChromotingApp(bool defer_start); |
+ void LaunchChromotingApp(bool defer_start, |
+ WindowOpenDisposition opt_window_open_disposition); |
Jamie
2015/01/06 22:18:51
window_open_disposition is not optional, so the op
kelvinp
2015/01/09 22:21:30
Done.
|
// If the Chromoting app was launched in deferred mode, tell it to continue |
// its regular start-up sequence. |
@@ -292,7 +294,12 @@ class RemoteDesktopBrowserTest : public extensions::PlatformAppBrowserTest { |
// the |browserTest.testName| ctor and calls |run| on the created object with |
// |testData|, which can be any arbitrary object literal. The script |
// browser_test.js must be loaded (using LoadScript) before calling this |
- // function. |
+ // function. The JavaScript browser test can optionally return a value when |
+ // the test finishes. The owner must take ownership of |opt_return_value|. |
+ void RunJavaScriptTest(content::WebContents* web_contents, |
+ const std::string& testName, |
+ const std::string& testData, |
+ base::Value** opt_return_value); |
Jamie
2015/01/06 22:18:51
Similarly, opt_ is not appropriate here (although
kelvinp
2015/01/09 22:21:30
Done.
|
void RunJavaScriptTest(content::WebContents* web_contents, |
const std::string& testName, |
const std::string& testData); |