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

Side by Side Diff: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 <utility> 11 #include <utility>
12 12
13 #include "webrtc/base/fakeclock.h"
14 #include "webrtc/base/ignore_wundef.h"
15 #include "webrtc/base/protobuf_utils.h"
13 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h " 16 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h "
14 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller .h" 17 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller .h"
15 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump _writer.h" 18 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump _writer.h"
16 #include "webrtc/rtc_base/fakeclock.h"
17 #include "webrtc/rtc_base/ignore_wundef.h"
18 #include "webrtc/rtc_base/protobuf_utils.h"
19 #include "webrtc/test/gtest.h" 19 #include "webrtc/test/gtest.h"
20 20
21 #if WEBRTC_ENABLE_PROTOBUF 21 #if WEBRTC_ENABLE_PROTOBUF
22 RTC_PUSH_IGNORING_WUNDEF() 22 RTC_PUSH_IGNORING_WUNDEF()
23 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD 23 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
24 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/conf ig.pb.h" 24 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/conf ig.pb.h"
25 #else 25 #else
26 #include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h" 26 #include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
27 #endif 27 #endif
28 RTC_POP_IGNORING_WUNDEF() 28 RTC_POP_IGNORING_WUNDEF()
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 // Reorder now. 479 // Reorder now.
480 CheckControllersOrder(controllers, 480 CheckControllersOrder(controllers,
481 std::vector<ControllerType>{ 481 std::vector<ControllerType>{
482 ControllerType::FRAME_LENGTH, ControllerType::FEC, 482 ControllerType::FRAME_LENGTH, ControllerType::FEC,
483 ControllerType::CHANNEL, ControllerType::DTX, 483 ControllerType::CHANNEL, ControllerType::DTX,
484 ControllerType::BIT_RATE}); 484 ControllerType::BIT_RATE});
485 } 485 }
486 #endif // WEBRTC_ENABLE_PROTOBUF 486 #endif // WEBRTC_ENABLE_PROTOBUF
487 487
488 } // namespace webrtc 488 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698