OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/remoting/remote_desktop_browsertest.h" | 5 #include "chrome/test/remoting/remote_desktop_browsertest.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 // why this is needed for the v1 app to work. | 460 // why this is needed for the v1 app to work. |
461 // Without this timeout the test fail with a "CloseWebContents called for | 461 // Without this timeout the test fail with a "CloseWebContents called for |
462 // tab not in our strip" error for the v1 app. | 462 // tab not in our strip" error for the v1 app. |
463 ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait()); | 463 ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait()); |
464 } | 464 } |
465 | 465 |
466 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() { | 466 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() { |
467 VerifyInternetAccess(); | 467 VerifyInternetAccess(); |
468 Install(); | 468 Install(); |
469 LaunchChromotingApp(); | 469 LaunchChromotingApp(); |
| 470 Auth(); |
470 LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js")); | 471 LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js")); |
471 Auth(); | |
472 ExpandMe2Me(); | 472 ExpandMe2Me(); |
473 EnsureRemoteConnectionEnabled(); | 473 EnsureRemoteConnectionEnabled(); |
474 } | 474 } |
475 | 475 |
476 void RemoteDesktopBrowserTest::Auth() { | 476 void RemoteDesktopBrowserTest::Auth() { |
477 Authorize(); | 477 Authorize(); |
478 Authenticate(); | 478 Authenticate(); |
479 Approve(); | 479 Approve(); |
480 } | 480 } |
481 | 481 |
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 // static | 810 // static |
811 bool RemoteDesktopBrowserTest::IsEnabled( | 811 bool RemoteDesktopBrowserTest::IsEnabled( |
812 content::WebContents* client_web_content, | 812 content::WebContents* client_web_content, |
813 const std::string& element_name) { | 813 const std::string& element_name) { |
814 return !ExecuteScriptAndExtractBool( | 814 return !ExecuteScriptAndExtractBool( |
815 client_web_content, | 815 client_web_content, |
816 "document.getElementById(\"" + element_name + "\").disabled"); | 816 "document.getElementById(\"" + element_name + "\").disabled"); |
817 } | 817 } |
818 | 818 |
819 } // namespace remoting | 819 } // namespace remoting |
OLD | NEW |