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

chrome/browser/net/gaia/token_service.h

Index: chrome/browser/net/gaia/token_service.h
===================================================================
--- chrome/browser/net/gaia/token_service.h	(revision 112743)
+++ chrome/browser/net/gaia/token_service.h	(working copy)
@@ -148,10 +148,6 @@
   // 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 @@
   // 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