OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/nss_util.h" | 7 #include "base/nss_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "base/synchronization/waitable_event.h" | 10 #include "base/synchronization/waitable_event.h" |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 CandidateSessionConfig::CreateDefault(), | 579 CandidateSessionConfig::CreateDefault(), |
580 NewCallback(&client_connection_callback_, | 580 NewCallback(&client_connection_callback_, |
581 &MockSessionCallback::OnStateChange)); | 581 &MockSessionCallback::OnStateChange)); |
582 | 582 |
583 ASSERT_TRUE( | 583 ASSERT_TRUE( |
584 done_event.TimedWait(base::TimeDelta::FromMilliseconds( | 584 done_event.TimedWait(base::TimeDelta::FromMilliseconds( |
585 TestTimeouts::action_max_timeout_ms()))); | 585 TestTimeouts::action_max_timeout_ms()))); |
586 } | 586 } |
587 | 587 |
588 // Verify that we can connect two endpoints. | 588 // Verify that we can connect two endpoints. |
589 TEST_F(JingleSessionTest, Connect) { | 589 // Disabled, http://crbug.com/70225. |
| 590 TEST_F(JingleSessionTest, DISABLED_Connect) { |
590 CreateServerPair(); | 591 CreateServerPair(); |
591 ASSERT_TRUE(InitiateConnection()); | 592 ASSERT_TRUE(InitiateConnection()); |
592 } | 593 } |
593 | 594 |
594 // Verify that data can be transmitted over the event channel. | 595 // Verify that data can be transmitted over the event channel. |
595 TEST_F(JingleSessionTest, TestControlChannel) { | 596 // Disabled, http://crbug.com/70225. |
| 597 TEST_F(JingleSessionTest, DISABLED_TestControlChannel) { |
596 CreateServerPair(); | 598 CreateServerPair(); |
597 ASSERT_TRUE(InitiateConnection()); | 599 ASSERT_TRUE(InitiateConnection()); |
598 scoped_refptr<TCPChannelTester> tester( | 600 scoped_refptr<TCPChannelTester> tester( |
599 new TCPChannelTester(thread_.message_loop(), host_session_, | 601 new TCPChannelTester(thread_.message_loop(), host_session_, |
600 client_session_)); | 602 client_session_)); |
601 tester->Start(ChannelTesterBase::CONTROL); | 603 tester->Start(ChannelTesterBase::CONTROL); |
602 ASSERT_TRUE(tester->WaitFinished()); | 604 ASSERT_TRUE(tester->WaitFinished()); |
603 tester->CheckResults(); | 605 tester->CheckResults(); |
604 | 606 |
605 // Connections must be closed while |tester| still exists. | 607 // Connections must be closed while |tester| still exists. |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 tester->CheckResults(); | 650 tester->CheckResults(); |
649 | 651 |
650 // Connections must be closed while |tester| still exists. | 652 // Connections must be closed while |tester| still exists. |
651 CloseSessions(); | 653 CloseSessions(); |
652 } | 654 } |
653 | 655 |
654 #endif | 656 #endif |
655 | 657 |
656 } // namespace protocol | 658 } // namespace protocol |
657 } // namespace remoting | 659 } // namespace remoting |
OLD | NEW |