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

Unified Diff: remoting/host/host_signaling_manager.cc

Issue 891663005: Add blocking IO restriction on the network thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@it2me_host_dcheck
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: remoting/host/host_signaling_manager.cc
diff --git a/remoting/host/host_signaling_manager.cc b/remoting/host/host_signaling_manager.cc
index 37da304111c645578f479c69e1c9a3cfe42c7e8f..20abbd135b6463c608669036fbd23a09aef862a7 100644
--- a/remoting/host/host_signaling_manager.cc
+++ b/remoting/host/host_signaling_manager.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/time/time.h"
-#include "net/base/network_change_notifier.h"
#include "net/socket/client_socket_factory.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/base/logging.h"
@@ -22,13 +21,11 @@ namespace remoting {
HostSignalingManager::HostSignalingManager(
scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory_for_listener,
const scoped_refptr<AutoThreadTaskRunner>& network_task_runner,
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier,
scoped_ptr<SignalStrategy> signal_strategy,
scoped_ptr<SignalingConnector> signaling_connector,
scoped_ptr<HeartbeatSender> heartbeat_sender)
: weak_factory_for_listener_(weak_factory_for_listener.Pass()),
network_task_runner_(network_task_runner),
- network_change_notifier_(network_change_notifier.Pass()),
signal_strategy_(signal_strategy.Pass()),
signaling_connector_(signaling_connector.Pass()),
heartbeat_sender_(heartbeat_sender.Pass()) {
@@ -50,9 +47,6 @@ scoped_ptr<HostSignalingManager> HostSignalingManager::Create(
scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory(
new base::WeakPtrFactory<Listener>(listener));
- scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
- net::NetworkChangeNotifier::Create());
-
scoped_ptr<XmppSignalStrategy> signal_strategy(
new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
url_request_context_getter, xmpp_server_config));
@@ -77,9 +71,8 @@ scoped_ptr<HostSignalingManager> HostSignalingManager::Create(
host_id, signal_strategy.get(), host_key_pair, directory_bot_jid));
return scoped_ptr<HostSignalingManager>(new HostSignalingManager(
- weak_factory.Pass(), network_task_runner, network_change_notifier.Pass(),
- signal_strategy.Pass(), signaling_connector.Pass(),
- heartbeat_sender.Pass()));
+ weak_factory.Pass(), network_task_runner, signal_strategy.Pass(),
+ signaling_connector.Pass(), heartbeat_sender.Pass()));
}
HostSignalingManager::~HostSignalingManager() {

Powered by Google App Engine
This is Rietveld 408576698