summaryrefslogtreecommitdiffstats
path: root/remoting/host/signaling_connector.cc
diff options
context:
space:
mode:
authordavidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 13:38:22 +0000
committerdavidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 13:38:22 +0000
commitf29f42b92d789486366cdcd0e26ff9fefb9f3ce6 (patch)
tree89f81fc034f7cd6cd016d913c1ce0b70365ec663 /remoting/host/signaling_connector.cc
parentd95cbbf84a22d12d599cf3573cc13141748fcc26 (diff)
downloadchromium_src-f29f42b92d789486366cdcd0e26ff9fefb9f3ce6.zip
chromium_src-f29f42b92d789486366cdcd0e26ff9fefb9f3ce6.tar.gz
chromium_src-f29f42b92d789486366cdcd0e26ff9fefb9f3ce6.tar.bz2
Device robot refresh token integrity validation.
Before using the robot account refresh token stored in an enterprise device's Local State, verify that the token is owned by the service account id found in the device policy. BUG=245121 Review URL: https://chromiumcodereview.appspot.com/17109006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/signaling_connector.cc')
-rw-r--r--remoting/host/signaling_connector.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/signaling_connector.cc b/remoting/host/signaling_connector.cc
index 29298f7..36af665 100644
--- a/remoting/host/signaling_connector.cc
+++ b/remoting/host/signaling_connector.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/callback.h"
-#include "google_apis/gaia/gaia_urls.h"
#include "google_apis/google_api_keys.h"
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_request_context_getter.h"
@@ -61,8 +60,7 @@ void SignalingConnector::EnableOAuth(
scoped_ptr<OAuthCredentials> oauth_credentials) {
oauth_credentials_ = oauth_credentials.Pass();
gaia_oauth_client_.reset(
- new gaia::GaiaOAuthClient(GaiaUrls::GetInstance()->oauth2_token_url(),
- url_request_context_getter_.get()));
+ new gaia::GaiaOAuthClient(url_request_context_getter_.get()));
}
void SignalingConnector::OnSignalStrategyStateChange(
@@ -239,8 +237,10 @@ void SignalingConnector::RefreshOAuthToken() {
};
refreshing_oauth_token_ = true;
+ std::vector<std::string> empty_scope_list; // (Use scope from refresh token.)
gaia_oauth_client_->RefreshToken(
- client_info, oauth_credentials_->refresh_token, 1, this);
+ client_info, oauth_credentials_->refresh_token, empty_scope_list,
+ 1, this);
}
} // namespace remoting