Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: webrtc/p2p/base/transportcontroller_unittest.cc

Issue 1895813003: Renames TransportController worker_thread to network_thread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/transportcontroller.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 this, &TransportControllerTest::OnReceiving); 74 this, &TransportControllerTest::OnReceiving);
75 transport_controller_->SignalGatheringState.connect( 75 transport_controller_->SignalGatheringState.connect(
76 this, &TransportControllerTest::OnGatheringState); 76 this, &TransportControllerTest::OnGatheringState);
77 transport_controller_->SignalCandidatesGathered.connect( 77 transport_controller_->SignalCandidatesGathered.connect(
78 this, &TransportControllerTest::OnCandidatesGathered); 78 this, &TransportControllerTest::OnCandidatesGathered);
79 } 79 }
80 80
81 FakeTransportChannel* CreateChannel(const std::string& content, 81 FakeTransportChannel* CreateChannel(const std::string& content,
82 int component) { 82 int component) {
83 TransportChannel* channel = 83 TransportChannel* channel =
84 transport_controller_->CreateTransportChannel_w(content, component); 84 transport_controller_->CreateTransportChannel_n(content, component);
85 return static_cast<FakeTransportChannel*>(channel); 85 return static_cast<FakeTransportChannel*>(channel);
86 } 86 }
87 87
88 void DestroyChannel(const std::string& content, int component) { 88 void DestroyChannel(const std::string& content, int component) {
89 transport_controller_->DestroyTransportChannel_w(content, component); 89 transport_controller_->DestroyTransportChannel_n(content, component);
90 } 90 }
91 91
92 Candidate CreateCandidate(int component) { 92 Candidate CreateCandidate(int component) {
93 Candidate c; 93 Candidate c;
94 c.set_address(rtc::SocketAddress("192.168.1.1", 8000)); 94 c.set_address(rtc::SocketAddress("192.168.1.1", 8000));
95 c.set_component(1); 95 c.set_component(1);
96 c.set_protocol(cricket::UDP_PROTOCOL_NAME); 96 c.set_protocol(cricket::UDP_PROTOCOL_NAME);
97 c.set_priority(1); 97 c.set_priority(1);
98 return c; 98 return c;
99 } 99 }
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 // new --> gathering --> complete 676 // new --> gathering --> complete
677 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout); 677 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout);
678 EXPECT_EQ(2, gathering_state_signal_count_); 678 EXPECT_EQ(2, gathering_state_signal_count_);
679 679
680 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout); 680 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout);
681 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout); 681 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout);
682 EXPECT_EQ(2, candidates_signal_count_); 682 EXPECT_EQ(2, candidates_signal_count_);
683 683
684 EXPECT_TRUE(!signaled_on_non_signaling_thread_); 684 EXPECT_TRUE(!signaled_on_non_signaling_thread_);
685 } 685 }
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportcontroller.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698