OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); | 116 base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); |
117 capture_thread_.Start(); | 117 capture_thread_.Start(); |
118 encode_thread_.Start(); | 118 encode_thread_.Start(); |
119 decode_thread_.Start(); | 119 decode_thread_.Start(); |
120 } | 120 } |
121 | 121 |
122 virtual ~ProtocolPerfTest() { | 122 virtual ~ProtocolPerfTest() { |
123 host_thread_.task_runner()->DeleteSoon(FROM_HERE, host_.release()); | 123 host_thread_.task_runner()->DeleteSoon(FROM_HERE, host_.release()); |
124 host_thread_.task_runner()->DeleteSoon(FROM_HERE, | 124 host_thread_.task_runner()->DeleteSoon(FROM_HERE, |
125 host_signaling_.release()); | 125 host_signaling_.release()); |
126 message_loop_.RunUntilIdle(); | 126 base::RunLoop().RunUntilIdle(); |
127 } | 127 } |
128 | 128 |
129 // ClientUserInterface interface. | 129 // ClientUserInterface interface. |
130 void OnConnectionState(protocol::ConnectionToHost::State state, | 130 void OnConnectionState(protocol::ConnectionToHost::State state, |
131 protocol::ErrorCode error) override { | 131 protocol::ErrorCode error) override { |
132 if (state == protocol::ConnectionToHost::CONNECTED) { | 132 if (state == protocol::ConnectionToHost::CONNECTED) { |
133 client_connected_ = true; | 133 client_connected_ = true; |
134 if (host_connected_) | 134 if (host_connected_) |
135 connecting_loop_->Quit(); | 135 connecting_loop_->Quit(); |
136 } | 136 } |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 | 692 |
693 TEST_P(ProtocolPerfTest, ScrollPerformanceIce) { | 693 TEST_P(ProtocolPerfTest, ScrollPerformanceIce) { |
694 MeasureScrollPerformance(false); | 694 MeasureScrollPerformance(false); |
695 } | 695 } |
696 | 696 |
697 TEST_P(ProtocolPerfTest, ScrollPerformanceWebrtc) { | 697 TEST_P(ProtocolPerfTest, ScrollPerformanceWebrtc) { |
698 MeasureScrollPerformance(true); | 698 MeasureScrollPerformance(true); |
699 } | 699 } |
700 | 700 |
701 } // namespace remoting | 701 } // namespace remoting |
OLD | NEW |