| Index: remoting/host/signaling_connector.cc
|
| diff --git a/remoting/host/signaling_connector.cc b/remoting/host/signaling_connector.cc
|
| index adc1571097c1a9a31ee4307f050650a1bf7b442e..7359e15486f1ed1823a6f71582d9f641d33a049e 100644
|
| --- a/remoting/host/signaling_connector.cc
|
| +++ b/remoting/host/signaling_connector.cc
|
| @@ -26,10 +26,12 @@ const int kMaxReconnectDelaySeconds = 10 * 60;
|
| SignalingConnector::SignalingConnector(
|
| XmppSignalStrategy* signal_strategy,
|
| scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker,
|
| + scoped_ptr<OAuthTokenGetter> oauth_token_getter,
|
| const base::Closure& auth_failed_callback)
|
| : signal_strategy_(signal_strategy),
|
| auth_failed_callback_(auth_failed_callback),
|
| dns_blackhole_checker_(dns_blackhole_checker.Pass()),
|
| + oauth_token_getter_(oauth_token_getter.Pass()),
|
| reconnect_attempts_(0) {
|
| DCHECK(!auth_failed_callback_.is_null());
|
| DCHECK(dns_blackhole_checker_.get());
|
| @@ -45,11 +47,6 @@ SignalingConnector::~SignalingConnector() {
|
| net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
|
| }
|
|
|
| -void SignalingConnector::EnableOAuth(
|
| - scoped_ptr<OAuthTokenGetter> oauth_token_getter) {
|
| - oauth_token_getter_ = oauth_token_getter.Pass();
|
| -}
|
| -
|
| void SignalingConnector::OnSignalStrategyStateChange(
|
| SignalStrategy::State state) {
|
| DCHECK(CalledOnValidThread());
|
| @@ -110,7 +107,7 @@ void SignalingConnector::OnAccessToken(OAuthTokenGetter::Status status,
|
| DCHECK_EQ(status, OAuthTokenGetter::SUCCESS);
|
| HOST_LOG << "Received user info.";
|
|
|
| - signal_strategy_->SetAuthInfo(user_email, access_token, "oauth2");
|
| + signal_strategy_->SetAuthInfo(user_email, access_token);
|
|
|
| // Now that we've refreshed the token and verified that it's for the correct
|
| // user account, try to connect using the new token.
|
|
|