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/file_util.h" | 8 #include "base/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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 VerifyChromotingLoaded(false); | 472 VerifyChromotingLoaded(false); |
473 } | 473 } |
474 | 474 |
475 // TODO(chaitali): Remove this additional timeout after we figure out | 475 // TODO(chaitali): Remove this additional timeout after we figure out |
476 // why this is needed for the v1 app to work. | 476 // why this is needed for the v1 app to work. |
477 // Without this timeout the test fail with a "CloseWebContents called for | 477 // Without this timeout the test fail with a "CloseWebContents called for |
478 // tab not in our strip" error for the v1 app. | 478 // tab not in our strip" error for the v1 app. |
479 ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait()); | 479 ASSERT_TRUE(TimeoutWaiter(base::TimeDelta::FromSeconds(2)).Wait()); |
480 } | 480 } |
481 | 481 |
| 482 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() { |
| 483 VerifyInternetAccess(); |
| 484 Install(); |
| 485 LaunchChromotingApp(); |
| 486 Auth(); |
| 487 ExpandMe2Me(); |
| 488 LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js")); |
| 489 } |
| 490 |
482 void RemoteDesktopBrowserTest::Auth() { | 491 void RemoteDesktopBrowserTest::Auth() { |
483 Authorize(); | 492 Authorize(); |
484 Authenticate(); | 493 Authenticate(); |
485 Approve(); | 494 Approve(); |
486 } | 495 } |
487 | 496 |
488 void RemoteDesktopBrowserTest::ConnectToLocalHost(bool remember_pin) { | 497 void RemoteDesktopBrowserTest::ConnectToLocalHost(bool remember_pin) { |
489 // Verify that the local host is online. | 498 // Verify that the local host is online. |
490 ASSERT_TRUE(ExecuteScriptAndExtractBool( | 499 ASSERT_TRUE(ExecuteScriptAndExtractBool( |
491 "remoting.hostList.localHost_.hostName && " | 500 "remoting.hostList.localHost_.hostName && " |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 // static | 795 // static |
787 bool RemoteDesktopBrowserTest::IsHostActionComplete( | 796 bool RemoteDesktopBrowserTest::IsHostActionComplete( |
788 content::WebContents* client_web_content, | 797 content::WebContents* client_web_content, |
789 std::string host_action_var) { | 798 std::string host_action_var) { |
790 return ExecuteScriptAndExtractBool( | 799 return ExecuteScriptAndExtractBool( |
791 client_web_content, | 800 client_web_content, |
792 host_action_var); | 801 host_action_var); |
793 } | 802 } |
794 | 803 |
795 } // namespace remoting | 804 } // namespace remoting |
OLD | NEW |