| Index: remoting/host/signaling_connector.cc
|
| diff --git a/remoting/host/signaling_connector.cc b/remoting/host/signaling_connector.cc
|
| index ad9fbe5dc1d45a9042df474b080ea753bc2f449c..710c3a22a8e852e6e3ff320977952b6d79dcdf4b 100644
|
| --- a/remoting/host/signaling_connector.cc
|
| +++ b/remoting/host/signaling_connector.cc
|
| @@ -10,6 +10,7 @@
|
| #include "google_apis/google_api_keys.h"
|
| #include "net/url_request/url_fetcher.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| +#include "remoting/base/logging.h"
|
| #include "remoting/host/dns_blackhole_checker.h"
|
|
|
| namespace remoting {
|
| @@ -71,10 +72,10 @@ void SignalingConnector::OnSignalStrategyStateChange(
|
| DCHECK(CalledOnValidThread());
|
|
|
| if (state == SignalStrategy::CONNECTED) {
|
| - LOG(INFO) << "Signaling connected.";
|
| + HOST_LOG << "Signaling connected.";
|
| reconnect_attempts_ = 0;
|
| } else if (state == SignalStrategy::DISCONNECTED) {
|
| - LOG(INFO) << "Signaling disconnected.";
|
| + HOST_LOG << "Signaling disconnected.";
|
| reconnect_attempts_++;
|
|
|
| // If authentication failed then we have an invalid OAuth token,
|
| @@ -97,7 +98,7 @@ void SignalingConnector::OnConnectionTypeChanged(
|
| DCHECK(CalledOnValidThread());
|
| if (type != net::NetworkChangeNotifier::CONNECTION_NONE &&
|
| signal_strategy_->GetState() == SignalStrategy::DISCONNECTED) {
|
| - LOG(INFO) << "Network state changed to online.";
|
| + HOST_LOG << "Network state changed to online.";
|
| ResetAndTryReconnect();
|
| }
|
| }
|
| @@ -105,7 +106,7 @@ void SignalingConnector::OnConnectionTypeChanged(
|
| void SignalingConnector::OnIPAddressChanged() {
|
| DCHECK(CalledOnValidThread());
|
| if (signal_strategy_->GetState() == SignalStrategy::DISCONNECTED) {
|
| - LOG(INFO) << "IP address has changed.";
|
| + HOST_LOG << "IP address has changed.";
|
| ResetAndTryReconnect();
|
| }
|
| }
|
| @@ -121,7 +122,7 @@ void SignalingConnector::OnRefreshTokenResponse(
|
| int expires_seconds) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(oauth_credentials_.get());
|
| - LOG(INFO) << "Received OAuth token.";
|
| + HOST_LOG << "Received OAuth token.";
|
|
|
| oauth_access_token_ = access_token;
|
| auth_token_expiry_time_ = base::Time::Now() +
|
| @@ -134,7 +135,7 @@ void SignalingConnector::OnRefreshTokenResponse(
|
| void SignalingConnector::OnGetUserEmailResponse(const std::string& user_email) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(oauth_credentials_.get());
|
| - LOG(INFO) << "Received user info.";
|
| + HOST_LOG << "Received user info.";
|
|
|
| if (user_email != oauth_credentials_->login) {
|
| LOG(ERROR) << "OAuth token and email address do not refer to "
|
| @@ -207,7 +208,7 @@ void SignalingConnector::OnDnsBlackholeCheckerDone(bool allow) {
|
| // an outright block.
|
| if (!allow) {
|
| reconnect_attempts_++;
|
| - LOG(INFO) << "Talkgadget check failed. Scheduling reconnect. Attempt "
|
| + HOST_LOG << "Talkgadget check failed. Scheduling reconnect. Attempt "
|
| << reconnect_attempts_;
|
| ScheduleTryReconnect();
|
| return;
|
| @@ -220,7 +221,7 @@ void SignalingConnector::OnDnsBlackholeCheckerDone(bool allow) {
|
| if (need_new_auth_token) {
|
| RefreshOAuthToken();
|
| } else {
|
| - LOG(INFO) << "Attempting to connect signaling.";
|
| + HOST_LOG << "Attempting to connect signaling.";
|
| signal_strategy_->Connect();
|
| }
|
| }
|
| @@ -228,7 +229,7 @@ void SignalingConnector::OnDnsBlackholeCheckerDone(bool allow) {
|
|
|
| void SignalingConnector::RefreshOAuthToken() {
|
| DCHECK(CalledOnValidThread());
|
| - LOG(INFO) << "Refreshing OAuth token.";
|
| + HOST_LOG << "Refreshing OAuth token.";
|
| DCHECK(!refreshing_oauth_token_);
|
|
|
| // Service accounts use different API keys, as they use the client app flow.
|
|
|