| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 client_session_)); | 618 client_session_)); |
| 619 tester->Start(ChannelTesterBase::VIDEO); | 619 tester->Start(ChannelTesterBase::VIDEO); |
| 620 ASSERT_TRUE(tester->WaitFinished()); | 620 ASSERT_TRUE(tester->WaitFinished()); |
| 621 tester->CheckResults(); | 621 tester->CheckResults(); |
| 622 | 622 |
| 623 // Connections must be closed while |tester| still exists. | 623 // Connections must be closed while |tester| still exists. |
| 624 CloseSessions(); | 624 CloseSessions(); |
| 625 } | 625 } |
| 626 | 626 |
| 627 // Verify that data can be transmitted over the event channel. | 627 // Verify that data can be transmitted over the event channel. |
| 628 TEST_F(JingleSessionTest, TestEventChannel) { | 628 // Disabled, http://crbug.com/70225. |
| 629 TEST_F(JingleSessionTest, DISABLED_TestEventChannel) { |
| 629 CreateServerPair(); | 630 CreateServerPair(); |
| 630 ASSERT_TRUE(InitiateConnection()); | 631 ASSERT_TRUE(InitiateConnection()); |
| 631 scoped_refptr<TCPChannelTester> tester( | 632 scoped_refptr<TCPChannelTester> tester( |
| 632 new TCPChannelTester(thread_.message_loop(), host_session_, | 633 new TCPChannelTester(thread_.message_loop(), host_session_, |
| 633 client_session_)); | 634 client_session_)); |
| 634 tester->Start(ChannelTesterBase::EVENT); | 635 tester->Start(ChannelTesterBase::EVENT); |
| 635 ASSERT_TRUE(tester->WaitFinished()); | 636 ASSERT_TRUE(tester->WaitFinished()); |
| 636 tester->CheckResults(); | 637 tester->CheckResults(); |
| 637 | 638 |
| 638 // Connections must be closed while |tester| still exists. | 639 // Connections must be closed while |tester| still exists. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 651 tester->CheckResults(); | 652 tester->CheckResults(); |
| 652 | 653 |
| 653 // Connections must be closed while |tester| still exists. | 654 // Connections must be closed while |tester| still exists. |
| 654 CloseSessions(); | 655 CloseSessions(); |
| 655 } | 656 } |
| 656 | 657 |
| 657 #endif | 658 #endif |
| 658 | 659 |
| 659 } // namespace protocol | 660 } // namespace protocol |
| 660 } // namespace remoting | 661 } // namespace remoting |
| OLD | NEW |