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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc

Issue 2381013002: Sort #includes that got unsorted when gmock.h and gtest.h moved to webrtc/test/ (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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
11 #include <algorithm> 11 #include <algorithm>
12 12
13 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h" 13 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h"
14 14
15 #include "webrtc/test/gtest.h"
16 #include "webrtc/base/common.h" 15 #include "webrtc/base/common.h"
17 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 16 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
18 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h" 17 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
19 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 18 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
19 #include "webrtc/test/gtest.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 namespace testing { 22 namespace testing {
23 namespace bwe { 23 namespace bwe {
24 24
25 TcpBweReceiver::TcpBweReceiver(int flow_id) 25 TcpBweReceiver::TcpBweReceiver(int flow_id)
26 : BweReceiver(flow_id), 26 : BweReceiver(flow_id),
27 last_feedback_ms_(0), 27 last_feedback_ms_(0),
28 latest_owd_ms_(0) { 28 latest_owd_ms_(0) {
29 } 29 }
(...skipping 15 matching lines...) Expand all
45 FeedbackPacket* fb = 45 FeedbackPacket* fb =
46 new TcpFeedback(flow_id_, now_ms * 1000, corrected_send_time_ms, acks_); 46 new TcpFeedback(flow_id_, now_ms * 1000, corrected_send_time_ms, acks_);
47 last_feedback_ms_ = now_ms; 47 last_feedback_ms_ = now_ms;
48 acks_.clear(); 48 acks_.clear();
49 return fb; 49 return fb;
50 } 50 }
51 51
52 } // namespace bwe 52 } // namespace bwe
53 } // namespace testing 53 } // namespace testing
54 } // namespace webrtc 54 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698