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

Unified Diff: remoting/protocol/chromium_port_allocator_factory.cc

Issue 1500663003: Removing references to webrtc::PortAllocatorFactoryInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing merge conflict, and removing some dead code. Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: remoting/protocol/chromium_port_allocator_factory.cc
diff --git a/remoting/protocol/chromium_port_allocator_factory.cc b/remoting/protocol/chromium_port_allocator_factory.cc
deleted file mode 100644
index b2626119b532c0e95593d27772c4a81ad4ff1b52..0000000000000000000000000000000000000000
--- a/remoting/protocol/chromium_port_allocator_factory.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "remoting/protocol/chromium_port_allocator_factory.h"
-
-#include "base/logging.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "remoting/protocol/chromium_port_allocator.h"
-#include "remoting/protocol/network_settings.h"
-
-namespace remoting {
-namespace protocol {
-
-ChromiumPortAllocatorFactory::ChromiumPortAllocatorFactory(
- const NetworkSettings& network_settings,
- scoped_refptr<net::URLRequestContextGetter> url_request_context_getter)
- : network_settings_(network_settings),
- url_request_context_getter_(url_request_context_getter) {}
-
-ChromiumPortAllocatorFactory::~ChromiumPortAllocatorFactory() {}
-
-rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
-ChromiumPortAllocatorFactory::Create(
- const NetworkSettings& network_settings,
- scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
- rtc::RefCountedObject<ChromiumPortAllocatorFactory>* allocator_factory =
- new rtc::RefCountedObject<ChromiumPortAllocatorFactory>(
- network_settings, url_request_context_getter);
- return allocator_factory;
-}
-
-cricket::PortAllocator* ChromiumPortAllocatorFactory::CreatePortAllocator(
- const std::vector<StunConfiguration>& stun_servers,
- const std::vector<TurnConfiguration>& turn_configurations) {
- scoped_ptr<ChromiumPortAllocator> port_allocator(
- ChromiumPortAllocator::Create(url_request_context_getter_,
- network_settings_));
-
- std::vector<rtc::SocketAddress> stun_hosts;
- for (auto stun_it = stun_servers.begin(); stun_it != stun_servers.end();
- ++stun_it) {
- stun_hosts.push_back(stun_it->server);
- }
- port_allocator->SetStunHosts(stun_hosts);
-
- // TODO(aiguha): Figure out how to translate |turn_configurations| into
- // turn hosts so we can set |port_allocator|'s relay hosts.
-
- return port_allocator.release();
-}
-
-} // namespace protocol
-} // namespace remoting
-

Powered by Google App Engine
This is Rietveld 408576698