From 0ace10fa0cb5b8852c825e743fbb7c0a77fe14f2 Mon Sep 17 00:00:00 2001 From: "atwilson@chromium.org" Date: Tue, 19 Feb 2013 16:21:59 +0000 Subject: [PATCH] Remove obsolete kDeviceManagementService token type BUG=174637 Review URL: https://chromiumcodereview.appspot.com/12279005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183229 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/signin/signin_internals_util.cc | 1 - chrome/browser/signin/token_service.cc | 1 - chrome/browser/signin/token_service.h | 2 +- google_apis/gaia/gaia_constants.cc | 1 - google_apis/gaia/gaia_constants.h | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/chrome/browser/signin/signin_internals_util.cc b/chrome/browser/signin/signin_internals_util.cc index ff1ded0efbbfa3..199dfad0206e5a 100644 --- a/chrome/browser/signin/signin_internals_util.cc +++ b/chrome/browser/signin/signin_internals_util.cc @@ -32,7 +32,6 @@ const char kObfuscatedGaiaIdFetcherToken[] = "ObfuscatedGaiaIdFetcher"; const char kOAuth2MintTokenFlowToken[] = "OAuth2MintTokenFlow"; const char* kTokenPrefsArray[] = { GaiaConstants::kSyncService, - GaiaConstants::kDeviceManagementService, GaiaConstants::kLSOService, GaiaConstants::kGaiaOAuth2LoginRefreshToken, GaiaConstants::kGaiaOAuth2LoginAccessToken, diff --git a/chrome/browser/signin/token_service.cc b/chrome/browser/signin/token_service.cc index bd0ca38a0dcf72..3fc30397b18d52 100644 --- a/chrome/browser/signin/token_service.cc +++ b/chrome/browser/signin/token_service.cc @@ -34,7 +34,6 @@ namespace { // List of services that are capable of ClientLogin-based authentication. const char* kServices[] = { GaiaConstants::kSyncService, - GaiaConstants::kDeviceManagementService, GaiaConstants::kLSOService }; diff --git a/chrome/browser/signin/token_service.h b/chrome/browser/signin/token_service.h index 04f101ecabb8d5..91b5910ae2b0f7 100644 --- a/chrome/browser/signin/token_service.h +++ b/chrome/browser/signin/token_service.h @@ -246,7 +246,7 @@ class TokenService : public GaiaAuthConsumer, // number of entries in this array must match the number of entries in the // kServices array declared in the cc file. If not, a compile time error // will occur. - scoped_ptr fetchers_[3]; + scoped_ptr fetchers_[2]; // Map from service to token. std::map token_map_; diff --git a/google_apis/gaia/gaia_constants.cc b/google_apis/gaia/gaia_constants.cc index 575e343bea3817..730c901273aace 100644 --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc @@ -26,7 +26,6 @@ const char kRemotingService[] = "chromoting"; const char kCloudPrintService[] = "cloudprint"; // Service/scope names for device management (cloud-based policy) server. -const char kDeviceManagementService[] = "mobilesync"; const char kDeviceManagementServiceOAuth[] = "https://www.googleapis.com/auth/chromeosdevicemanagement"; diff --git a/google_apis/gaia/gaia_constants.h b/google_apis/gaia/gaia_constants.h index d09141c443ee25..d3aac05cb6f919 100644 --- a/google_apis/gaia/gaia_constants.h +++ b/google_apis/gaia/gaia_constants.h @@ -19,7 +19,6 @@ extern const char kPicasaService[]; extern const char kSyncService[]; extern const char kRemotingService[]; extern const char kCloudPrintService[]; -extern const char kDeviceManagementService[]; extern const char kDeviceManagementServiceOAuth[]; extern const char kCWSService[]; extern const char kCWSNotificationScope[];