Chromium Code Reviews| Index: chrome/test/remoting/remote_desktop_browsertest.cc |
| diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc |
| index a18778a990d5598c1717992faba72e710ac70232..28428eb9b84231267605d570fc1b5e7e4b5c198e 100644 |
| --- a/chrome/test/remoting/remote_desktop_browsertest.cc |
| +++ b/chrome/test/remoting/remote_desktop_browsertest.cc |
| @@ -451,6 +451,18 @@ void RemoteDesktopBrowserTest::Install() { |
| VerifyChromotingLoaded(true); |
| } |
| +void RemoteDesktopBrowserTest::LoadBrowserTestJavaScript() { |
| + content::WebContents* content = app_web_content(); |
|
kelvinp
2015/01/08 22:54:40
As per your suggestion in the other CL
https://cod
Jamie
2015/01/08 23:43:08
Done.
|
| + LoadScript(content, FILE_PATH_LITERAL("browser_test.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_client_plugin.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_host_list_api.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_identity.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_oauth2_api.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_session_connector.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("mock_signal_strategy.js")); |
| + LoadScript(content, FILE_PATH_LITERAL("timeout_waiter.js")); |
| +} |
| + |
| void RemoteDesktopBrowserTest::Cleanup() { |
| // TODO(weitaosu): Remove this hack by blocking on the appropriate |
| // notification. |
| @@ -474,8 +486,8 @@ void RemoteDesktopBrowserTest::SetUpTestForMe2Me() { |
| VerifyInternetAccess(); |
| Install(); |
| LaunchChromotingApp(false); |
| + LoadBrowserTestJavaScript(); |
| Auth(); |
| - LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js")); |
| ExpandMe2Me(); |
| // The call to EnsureRemoteConnectionEnabled() does a PIN reset. |
| // This causes the test to fail because of a recent bug: |