summaryrefslogtreecommitdiffstats
path: root/chrome/browser/managed_mode
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 16:11:30 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 16:11:30 +0000
commit95ea945bb36cfca5438da44096283c8025aa3687 (patch)
tree074e25550c24e8412caed0047a8ffac3a018a637 /chrome/browser/managed_mode
parenta7789f2e0b5652a2c81c08c5f12dce5ad0171e6a (diff)
downloadchromium_src-95ea945bb36cfca5438da44096283c8025aa3687.zip
chromium_src-95ea945bb36cfca5438da44096283c8025aa3687.tar.gz
chromium_src-95ea945bb36cfca5438da44096283c8025aa3687.tar.bz2
Remove command-line flags for OAuth scopes.
There is no reason why one would want to switch to alternate OAuth scopes, because these are identifiers and not URLs to make requests to. BUG=chromium:350299 TBR=bauerb@chromium.org Review URL: https://codereview.chromium.org/190353002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/managed_mode')
-rw-r--r--chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc4
-rw-r--r--chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc
index 21705ea..10984cc 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc
+++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc
@@ -22,9 +22,9 @@
#include "net/url_request/url_fetcher.h"
#include "net/url_request/url_request_status.h"
+using GaiaConstants::kChromeSyncManagedOAuth2Scope;
using base::Time;
using gaia::GaiaOAuthClient;
-using GaiaConstants::kChromeSyncManagedOAuth2Scope;
using net::URLFetcher;
using net::URLFetcherDelegate;
using net::URLRequestContextGetter;
@@ -129,7 +129,7 @@ void ManagedUserRefreshTokenFetcherImpl::Start(
void ManagedUserRefreshTokenFetcherImpl::StartFetching() {
OAuth2TokenService::ScopeSet scopes;
- scopes.insert(GaiaUrls::GetInstance()->oauth1_login_scope());
+ scopes.insert(GaiaConstants::kOAuth1LoginScope);
access_token_request_ = oauth2_token_service_->StartRequest(
account_id_, scopes, this);
}
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
index cb4043f..9211a50 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
+++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread_bundle.h"
+#include "google_apis/gaia/gaia_constants.h"
#include "google_apis/gaia/gaia_oauth_client.h"
#include "google_apis/gaia/gaia_urls.h"
#include "google_apis/gaia/google_service_auth_error.h"
@@ -79,8 +80,7 @@ void VerifyTokenRequest(
std::vector<FakeProfileOAuth2TokenService::PendingRequest> requests) {
ASSERT_EQ(1u, requests.size());
EXPECT_EQ(1u, requests[0].scopes.size());
- EXPECT_EQ(1u, requests[0].scopes.count(
- GaiaUrls::GetInstance()->oauth1_login_scope()));
+ EXPECT_EQ(1u, requests[0].scopes.count(GaiaConstants::kOAuth1LoginScope));
}
} // namespace