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

Side by Side 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, 10 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/host_signaling_manager.h" 5 #include "remoting/host/host_signaling_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "net/base/network_change_notifier.h"
10 #include "net/socket/client_socket_factory.h" 9 #include "net/socket/client_socket_factory.h"
11 #include "remoting/base/auto_thread_task_runner.h" 10 #include "remoting/base/auto_thread_task_runner.h"
12 #include "remoting/base/logging.h" 11 #include "remoting/base/logging.h"
13 #include "remoting/base/url_request_context_getter.h" 12 #include "remoting/base/url_request_context_getter.h"
14 #include "remoting/host/chromoting_host_context.h" 13 #include "remoting/host/chromoting_host_context.h"
15 #include "remoting/host/dns_blackhole_checker.h" 14 #include "remoting/host/dns_blackhole_checker.h"
16 #include "remoting/host/heartbeat_sender.h" 15 #include "remoting/host/heartbeat_sender.h"
17 #include "remoting/host/signaling_connector.h" 16 #include "remoting/host/signaling_connector.h"
18 #include "remoting/signaling/xmpp_signal_strategy.h" 17 #include "remoting/signaling/xmpp_signal_strategy.h"
19 18
20 namespace remoting { 19 namespace remoting {
21 20
22 HostSignalingManager::HostSignalingManager( 21 HostSignalingManager::HostSignalingManager(
23 scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory_for_listener, 22 scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory_for_listener,
24 const scoped_refptr<AutoThreadTaskRunner>& network_task_runner, 23 const scoped_refptr<AutoThreadTaskRunner>& network_task_runner,
25 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier,
26 scoped_ptr<SignalStrategy> signal_strategy, 24 scoped_ptr<SignalStrategy> signal_strategy,
27 scoped_ptr<SignalingConnector> signaling_connector, 25 scoped_ptr<SignalingConnector> signaling_connector,
28 scoped_ptr<HeartbeatSender> heartbeat_sender) 26 scoped_ptr<HeartbeatSender> heartbeat_sender)
29 : weak_factory_for_listener_(weak_factory_for_listener.Pass()), 27 : weak_factory_for_listener_(weak_factory_for_listener.Pass()),
30 network_task_runner_(network_task_runner), 28 network_task_runner_(network_task_runner),
31 network_change_notifier_(network_change_notifier.Pass()),
32 signal_strategy_(signal_strategy.Pass()), 29 signal_strategy_(signal_strategy.Pass()),
33 signaling_connector_(signaling_connector.Pass()), 30 signaling_connector_(signaling_connector.Pass()),
34 heartbeat_sender_(heartbeat_sender.Pass()) { 31 heartbeat_sender_(heartbeat_sender.Pass()) {
35 } 32 }
36 33
37 scoped_ptr<HostSignalingManager> HostSignalingManager::Create( 34 scoped_ptr<HostSignalingManager> HostSignalingManager::Create(
38 Listener* listener, 35 Listener* listener,
39 const scoped_refptr<AutoThreadTaskRunner>& network_task_runner, 36 const scoped_refptr<AutoThreadTaskRunner>& network_task_runner,
40 const scoped_refptr<net::URLRequestContextGetter>& 37 const scoped_refptr<net::URLRequestContextGetter>&
41 url_request_context_getter, 38 url_request_context_getter,
42 const XmppSignalStrategy::XmppServerConfig& xmpp_server_config, 39 const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
43 const std::string& talkgadget_prefix_policy, 40 const std::string& talkgadget_prefix_policy,
44 const std::string& host_id, 41 const std::string& host_id,
45 const scoped_refptr<const RsaKeyPair>& host_key_pair, 42 const scoped_refptr<const RsaKeyPair>& host_key_pair,
46 const std::string& directory_bot_jid, 43 const std::string& directory_bot_jid,
47 scoped_ptr<OAuthTokenGetter::OAuthCredentials> oauth_credentials) { 44 scoped_ptr<OAuthTokenGetter::OAuthCredentials> oauth_credentials) {
48 DCHECK(network_task_runner->BelongsToCurrentThread()); 45 DCHECK(network_task_runner->BelongsToCurrentThread());
49 46
50 scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory( 47 scoped_ptr<base::WeakPtrFactory<Listener>> weak_factory(
51 new base::WeakPtrFactory<Listener>(listener)); 48 new base::WeakPtrFactory<Listener>(listener));
52 49
53 scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
54 net::NetworkChangeNotifier::Create());
55
56 scoped_ptr<XmppSignalStrategy> signal_strategy( 50 scoped_ptr<XmppSignalStrategy> signal_strategy(
57 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(), 51 new XmppSignalStrategy(net::ClientSocketFactory::GetDefaultFactory(),
58 url_request_context_getter, xmpp_server_config)); 52 url_request_context_getter, xmpp_server_config));
59 53
60 scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(new DnsBlackholeChecker( 54 scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(new DnsBlackholeChecker(
61 url_request_context_getter, talkgadget_prefix_policy)); 55 url_request_context_getter, talkgadget_prefix_policy));
62 56
63 scoped_ptr<SignalingConnector> signaling_connector(new SignalingConnector( 57 scoped_ptr<SignalingConnector> signaling_connector(new SignalingConnector(
64 signal_strategy.get(), dns_blackhole_checker.Pass(), 58 signal_strategy.get(), dns_blackhole_checker.Pass(),
65 base::Bind(&Listener::OnAuthFailed, weak_factory->GetWeakPtr()))); 59 base::Bind(&Listener::OnAuthFailed, weak_factory->GetWeakPtr())));
66 60
67 if (!oauth_credentials->refresh_token.empty()) { 61 if (!oauth_credentials->refresh_token.empty()) {
68 scoped_ptr<OAuthTokenGetter> oauth_token_getter(new OAuthTokenGetter( 62 scoped_ptr<OAuthTokenGetter> oauth_token_getter(new OAuthTokenGetter(
69 oauth_credentials.Pass(), url_request_context_getter, false)); 63 oauth_credentials.Pass(), url_request_context_getter, false));
70 64
71 signaling_connector->EnableOAuth(oauth_token_getter.Pass()); 65 signaling_connector->EnableOAuth(oauth_token_getter.Pass());
72 } 66 }
73 67
74 scoped_ptr<HeartbeatSender> heartbeat_sender(new HeartbeatSender( 68 scoped_ptr<HeartbeatSender> heartbeat_sender(new HeartbeatSender(
75 base::Bind(&Listener::OnHeartbeatSuccessful, weak_factory->GetWeakPtr()), 69 base::Bind(&Listener::OnHeartbeatSuccessful, weak_factory->GetWeakPtr()),
76 base::Bind(&Listener::OnUnknownHostIdError, weak_factory->GetWeakPtr()), 70 base::Bind(&Listener::OnUnknownHostIdError, weak_factory->GetWeakPtr()),
77 host_id, signal_strategy.get(), host_key_pair, directory_bot_jid)); 71 host_id, signal_strategy.get(), host_key_pair, directory_bot_jid));
78 72
79 return scoped_ptr<HostSignalingManager>(new HostSignalingManager( 73 return scoped_ptr<HostSignalingManager>(new HostSignalingManager(
80 weak_factory.Pass(), network_task_runner, network_change_notifier.Pass(), 74 weak_factory.Pass(), network_task_runner, signal_strategy.Pass(),
81 signal_strategy.Pass(), signaling_connector.Pass(), 75 signaling_connector.Pass(), heartbeat_sender.Pass()));
82 heartbeat_sender.Pass()));
83 } 76 }
84 77
85 HostSignalingManager::~HostSignalingManager() { 78 HostSignalingManager::~HostSignalingManager() {
86 DCHECK(network_task_runner_->BelongsToCurrentThread()); 79 DCHECK(network_task_runner_->BelongsToCurrentThread());
87 } 80 }
88 81
89 void HostSignalingManager::SendHostOfflineReasonAndDelete( 82 void HostSignalingManager::SendHostOfflineReasonAndDelete(
90 const std::string& host_offline_reason, 83 const std::string& host_offline_reason,
91 const base::TimeDelta& timeout) { 84 const base::TimeDelta& timeout) {
92 DCHECK(network_task_runner_->BelongsToCurrentThread()); 85 DCHECK(network_task_runner_->BelongsToCurrentThread());
(...skipping 15 matching lines...) Expand all
108 if (success) { 101 if (success) {
109 HOST_LOG << "SendHostOfflineReason: succeeded"; 102 HOST_LOG << "SendHostOfflineReason: succeeded";
110 } else { 103 } else {
111 HOST_LOG << "SendHostOfflineReason: timed out"; 104 HOST_LOG << "SendHostOfflineReason: timed out";
112 } 105 }
113 106
114 delete this; 107 delete this;
115 } 108 }
116 109
117 } // namespace remoting 110 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698