Remove stuff in TokenService that is not needed anymore (due to OAuth based approach):

chrome/browser/net/gaia/token_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/gaia/token_service.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 
 // Unfortunately kNumServices must be defined in the .h.
 // TODO(chron): Sync doesn't use the TalkToken anymore so we can stop
 //              requesting it.
 const char* TokenService::kServices[] = {
   GaiaConstants::kPicasaService,
   GaiaConstants::kGaiaService,
   GaiaConstants::kSyncService,
   GaiaConstants::kTalkService,
   GaiaConstants::kDeviceManagementService,
-  GaiaConstants::kCWSService,
   GaiaConstants::kLSOService,
 };
 
 const char* kUnusedServiceScope = "unused-service-scope";
 
 // Unfortunately kNumOAuthServices must be defined in the .h.
 // For OAuth, Chrome uses the OAuth2 service scope as the service name.
 const char* TokenService::kOAuthServices[] = {
   GaiaConstants::kSyncServiceOAuth,
 };
@@ skipping 156 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(AreCredentialsValid());
   for (int i = 0; i < kNumServices; i++) {
     fetchers_[i].reset(new GaiaAuthFetcher(this, source_, getter_));
     fetchers_[i]->StartIssueAuthToken(credentials_.sid,
                                       credentials_.lsid,
                                       kServices[i]);
   }
 }
 
-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());
   for (int i = 0; i < kNumOAuthServices; i++) {
     oauth_fetchers_[i].reset(
         new GaiaOAuthFetcher(this, getter_, profile_, kUnusedServiceScope));
     oauth_fetchers_[i]->StartOAuthWrapBridge(oauth_token_,
                                              oauth_secret_,
                                              GaiaConstants::kGaiaOAuthDuration,
                                              kOAuthServices[i]);
@@ skipping 242 matching lines @@
 }
 
 void TokenService::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_TOKEN_UPDATED);
   TokenAvailableDetails* tok_details =
       content::Details<TokenAvailableDetails>(details).ptr();
   OnIssueAuthTokenSuccess(tok_details->service(), tok_details->token());
 }