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

chrome/browser/net/gaia/token_service.h

 // 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.
 //
 // The TokenService will supply authentication tokens for any service that
 // needs it, such as sync. Whenever the user logs in, a controller watching
 // the token service is expected either to call ClientLogin to derive a new
 // SID and LSID, or to use GAIA OAuth requests to derive an OAuth1 access
 // token for the OAuthLogin scope.  Whenever such credentials are available,
 // the TokenService should be updated with new credentials.  The controller
@@ skipping 130 matching lines @@
   // For services with their own auth routines, they can read the OAuth token
   // and secret directly. Deprecated (in the sense of discouraged).
   bool HasOAuthCredentials() const;
   const std::string& GetOAuthToken() const;
   const std::string& GetOAuthSecret() const;
 
   // Tokens will be fetched for all services(sync, talk) in the background.
   // 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;
 
   // OAuth login token is an all-powerful token that allows creating OAuth2
   // tokens for any other scope (i.e. down-scoping).
   // Typical use is to create an OAuth2 token for appropriate scope and then
   // use that token to call a Google API.
   virtual bool HasOAuthLoginToken() const;
   const std::string& GetOAuth2LoginRefreshToken() const;
@@ skipping 77 matching lines @@
   // Credentials from Gaia OAuth (uber/login token)
   std::string oauth_token_;
   std::string oauth_secret_;
 
   // Size of array of services capable of ClientLogin-based authentication.
   // This value must be defined here.
   // NOTE: The use of --enable-sync-oauth does not affect this count.  The
   // 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;

[zel, 2011/12/05 22:04:16]

GaiaConstants::kPicasaService got removed as well in another CL -
http://codereview.chromium.org/8742008/ - you will have to resolve this conflict
before landing

[Munjal (Google), 2011/12/05 22:12:24]

Yep, I have that in mind. In fact, I was wondering if the code will be
auto-merged since both I and Sailesh set this value to 6 (ahd hence have an
identical line). If so, I should be very careful in editing file manually even
though not marked conflicted.

Thanks for pointing this out.

   // 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
   // about the ordering, nor do we care which is for which service.
   scoped_ptr<GaiaAuthFetcher> fetchers_[kNumServices];
 
   // Size of array of services capable of OAuth-based authentication.  This
   // value must be defined here.
   // NOTE: The use of --enable-sync-oauth does not affect this count.  The
   // TokenService can continue to do some degree of OAuth token
@@ skipping 13 matching lines @@
 
   friend class TokenServiceTest;
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryBasic);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryAdvanced);
   FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, FullIntegrationNewServicesAdded);
 
   DISALLOW_COPY_AND_ASSIGN(TokenService);
 };
 
 #endif  // CHROME_BROWSER_NET_GAIA_TOKEN_SERVICE_H_