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

chrome/browser/net/gaia/token_service_unittest.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.
 //
 // This file defines a unit test for the profile's token service.
 
 #include "chrome/browser/net/gaia/token_service_unittest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 360 matching lines @@
   // Gaia returns the entire result as the token so while this is a shared
   // result with ClientLogin, it doesn't matter, we should still get it back.
   EXPECT_EQ(service_.GetTokenForService(GaiaConstants::kSyncService), result);
   EXPECT_EQ(service_.GetTokenForService(GaiaConstants::kTalkService), result);
 
   service_.ResetCredentialsInMemory();
   EXPECT_FALSE(service_.HasTokenForService(GaiaConstants::kSyncService));
   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<MockFetcher> 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<MockFetcher> 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<std::string, std::string> db_tokens;
   std::map<std::string, std::string> memory_tokens;
 
   service_.LoadTokensIntoMemory(db_tokens, &memory_tokens);
   EXPECT_TRUE(db_tokens.empty());
   EXPECT_TRUE(memory_tokens.empty());
   EXPECT_EQ(0U, success_tracker_.size());
 
@@ skipping 133 matching lines @@
 
     *CommandLine::ForCurrentProcess() = original_cl;
   }
 };
 
 TEST_F(TokenServiceCommandLineTest, TestValueOverride) {
   EXPECT_TRUE(service_.HasTokenForService("my_service"));
   EXPECT_EQ("my_value", service_.GetTokenForService("my_service"));
 }
 #endif   // ifndef NDEBUG