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

Unified Diff: remoting/host/signaling_connector.cc

Issue 10388226: This broke M20 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
« no previous file with comments | « remoting/host/signaling_connector.h ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/signaling_connector.cc
===================================================================
--- remoting/host/signaling_connector.cc (revision 138203)
+++ remoting/host/signaling_connector.cc (working copy)
@@ -55,8 +55,7 @@
scoped_ptr<OAuthCredentials> oauth_credentials,
net::URLRequestContextGetter* url_context) {
oauth_credentials_ = oauth_credentials.Pass();
- gaia_oauth_client_.reset(new GaiaOAuthClient(
- OAuthProviderInfo::GetDefault(), url_context));
+ gaia_oauth_client_.reset(new GaiaOAuthClient(kGaiaOAuth2Url, url_context));
}
void SignalingConnector::OnSignalStrategyStateChange(
@@ -94,20 +93,11 @@
}
}
-void SignalingConnector::OnRefreshTokenResponse(const std::string& user_email,
- const std::string& access_token,
+void SignalingConnector::OnRefreshTokenResponse(const std::string& access_token,
int expires_seconds) {
DCHECK(CalledOnValidThread());
DCHECK(oauth_credentials_.get());
LOG(INFO) << "Received OAuth token.";
-
- if (user_email != oauth_credentials_->login) {
- LOG(ERROR) << "OAuth token and email address do not refer to "
- "the same account.";
- auth_failed_callback_.Run();
- return;
- }
-
refreshing_oauth_token_ = false;
auth_token_expiry_time_ = base::Time::Now() +
base::TimeDelta::FromSeconds(expires_seconds) -
« no previous file with comments | « remoting/host/signaling_connector.h ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698