mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 23:01:21 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
66 lines
2 KiB
C++
66 lines
2 KiB
C++
/*
|
|
* Copyright 2019 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/ice_transport_factory.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "p2p/base/ice_transport_internal.h"
|
|
#include "p2p/base/p2p_transport_channel.h"
|
|
#include "p2p/base/port_allocator.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
// This implementation of IceTransportInterface is used in cases where
|
|
// the only reference to the P2PTransport will be through this class.
|
|
// It must be constructed, accessed and destroyed on the signaling thread.
|
|
class IceTransportWithTransportChannel : public IceTransportInterface {
|
|
public:
|
|
IceTransportWithTransportChannel(
|
|
std::unique_ptr<cricket::IceTransportInternal> internal)
|
|
: internal_(std::move(internal)) {}
|
|
|
|
~IceTransportWithTransportChannel() override {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
}
|
|
|
|
cricket::IceTransportInternal* internal() override {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
return internal_.get();
|
|
}
|
|
|
|
private:
|
|
const rtc::ThreadChecker thread_checker_{};
|
|
const std::unique_ptr<cricket::IceTransportInternal> internal_
|
|
RTC_GUARDED_BY(thread_checker_);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
|
|
cricket::PortAllocator* port_allocator) {
|
|
IceTransportInit init;
|
|
init.set_port_allocator(port_allocator);
|
|
return CreateIceTransport(std::move(init));
|
|
}
|
|
|
|
rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
|
|
IceTransportInit init) {
|
|
return new rtc::RefCountedObject<IceTransportWithTransportChannel>(
|
|
std::make_unique<cricket::P2PTransportChannel>(
|
|
"", 0, init.port_allocator(), init.async_resolver_factory(),
|
|
init.event_log()));
|
|
}
|
|
|
|
} // namespace webrtc
|