From 75c3e3ab998af77062e4a2cf67b2a437ca2cedbd Mon Sep 17 00:00:00 2001 From: "munjal@chromium.org" Date: Mon, 5 Dec 2011 23:32:29 +0000 Subject: [PATCH] Remove stuff in TokenService that is not needed anymore (due to OAuth based approach): - Remove the CWS service and token generation for that. - Remove StartFetchingMissingTokens method - Remove unit test for removed code. Review URL: http://codereview.chromium.org/8769053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113058 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/net/gaia/token_service.cc | 16 ------ chrome/browser/net/gaia/token_service.h | 6 +-- .../net/gaia/token_service_unittest.cc | 54 ------------------- chrome/common/net/gaia/gaia_constants.cc | 3 +- 4 files changed, 2 insertions(+), 77 deletions(-) diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index 1c342c0490a853..a3d6d035aac00a 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -27,7 +27,6 @@ const char* TokenService::kServices[] = { GaiaConstants::kSyncService, GaiaConstants::kTalkService, GaiaConstants::kDeviceManagementService, - GaiaConstants::kCWSService, GaiaConstants::kLSOService, }; @@ -204,21 +203,6 @@ void TokenService::StartFetchingTokens() { } } -void TokenService::StartFetchingMissingTokens() { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - DCHECK(AreCredentialsValid()); - for (int i = 0; i < kNumServices; i++) { - // if token exists for a service, skip for that service. - if (HasTokenForService(kServices[i])) - continue; - - fetchers_[i].reset(new GaiaAuthFetcher(this, source_, getter_)); - fetchers_[i]->StartIssueAuthToken(credentials_.sid, - credentials_.lsid, - kServices[i]); - } -} - void TokenService::StartFetchingOAuthTokens() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(HasOAuthCredentials()); diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h index 792bb517d2aaa0..6f57fe1bd95c8c 100644 --- a/chrome/browser/net/gaia/token_service.h +++ b/chrome/browser/net/gaia/token_service.h @@ -148,10 +148,6 @@ class TokenService : public GaiaAuthConsumer, // Results come back via event channel. Services can also poll before events // are issued. void StartFetchingTokens(); - // Fetch tokens for only those services for which we are missing tokens. - // This can happen when new services are added in new Chrome versions and the - // user is already logged in. - void StartFetchingMissingTokens(); void StartFetchingOAuthTokens(); virtual bool HasTokenForService(const char* service) const; const std::string& GetTokenForService(const char* const service) const; @@ -249,7 +245,7 @@ class TokenService : public GaiaAuthConsumer, // TokenService can continue to do some degree of ClientLogin token // management, mostly related to persistence while Sync and possibly other // services are using OAuth-based authentication. - static const int kNumServices = 7; + static const int kNumServices = 6; // List of services that are capable of ClientLogin-based authentication. static const char* kServices[kNumServices]; // A bunch of fetchers suitable for ClientLogin token issuing. We don't care diff --git a/chrome/browser/net/gaia/token_service_unittest.cc b/chrome/browser/net/gaia/token_service_unittest.cc index add08934d9ae72..7ac44735b6d5d9 100644 --- a/chrome/browser/net/gaia/token_service_unittest.cc +++ b/chrome/browser/net/gaia/token_service_unittest.cc @@ -378,60 +378,6 @@ TEST_F(TokenServiceTest, FullIntegration) { EXPECT_FALSE(service_.HasTokenForService(GaiaConstants::kTalkService)); } -TEST_F(TokenServiceTest, FullIntegrationNewServicesAdded) { - std::string token1 = "token1"; - - for (int i = 0; i < TokenService::kNumServices; ++i) { - const char* service = TokenService::kServices[i]; - EXPECT_FALSE(service_.HasTokenForService(service)); - } - { - MockFactory factory; - factory.set_results(token1); - service_.StartFetchingTokens(); - } - - for (int i = 0; i < TokenService::kNumServices; ++i) { - const char* service = TokenService::kServices[i]; - EXPECT_TRUE(service_.HasTokenForService(service)); - EXPECT_EQ(token1, service_.GetTokenForService(service)); - } - - // Clear tokens for some services to simulate that those services got - // added in a new Chrome release. - service_.token_map_.erase(GaiaConstants::kLSOService); - service_.token_map_.erase(GaiaConstants::kCWSService); - - for (int i = 0; i < TokenService::kNumServices; ++i) { - const char* service = TokenService::kServices[i]; - if (service == GaiaConstants::kLSOService || - service == GaiaConstants::kCWSService) { - EXPECT_FALSE(service_.HasTokenForService(service)); - } else { - EXPECT_TRUE(service_.HasTokenForService(service)); - EXPECT_EQ(token1, service_.GetTokenForService(service)); - } - } - - std::string token2 = "token2"; - { - MockFactory factory; - factory.set_results(token2); - service_.StartFetchingMissingTokens(); - } - - for (int i = 0; i < TokenService::kNumServices; ++i) { - const char* service = TokenService::kServices[i]; - EXPECT_TRUE(service_.HasTokenForService(service)); - if (service == GaiaConstants::kLSOService || - service == GaiaConstants::kCWSService) { - EXPECT_EQ(token2, service_.GetTokenForService(service)); - } else { - EXPECT_EQ(token1, service_.GetTokenForService(service)); - } - } -} - TEST_F(TokenServiceTest, LoadTokensIntoMemoryBasic) { // Validate that the method sets proper data in notifications and map. std::map db_tokens; diff --git a/chrome/common/net/gaia/gaia_constants.cc b/chrome/common/net/gaia/gaia_constants.cc index 675d173bbbd9cf..8c845784b0dcaa 100644 --- a/chrome/common/net/gaia/gaia_constants.cc +++ b/chrome/common/net/gaia/gaia_constants.cc @@ -33,8 +33,7 @@ const char kDeviceManagementService[] = "mobilesync"; const char kDeviceManagementServiceOAuth[] = "https://www.googleapis.com/auth/chromeosdevicemanagement"; -// Service/scope names for chrome web store. -const char kCWSService[] = "chromewebstore"; +// OAuth scopes for chrome web store. const char kCWSNotificationScope[] = "https://www.googleapis.com/auth/chromewebstore.notification";