Even more test cleanup. Some fixes to non-test code.

chrome/browser/net/gaia/token_service_unittest.cc

 // Copyright (c) 2010 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/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher_unittest.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 
+TokenAvailableTracker::TokenAvailableTracker() {}
+
+TokenAvailableTracker::~TokenAvailableTracker() {}
+
+void TokenAvailableTracker::Observe(NotificationType type,
+                                    const NotificationSource& source,
+                                    const NotificationDetails& details) {
+  TestNotificationTracker::Observe(type, source, details);
+  if (type == NotificationType::TOKEN_AVAILABLE) {
+    Details<const TokenService::TokenAvailableDetails> full = details;
+    details_ = *full.ptr();
+  }
+}
+
+TokenFailedTracker::TokenFailedTracker() {}
+
+TokenFailedTracker::~TokenFailedTracker() {}
+
+void TokenFailedTracker::Observe(NotificationType type,
+                                 const NotificationSource& source,
+                                 const NotificationDetails& details) {
+  TestNotificationTracker::Observe(type, source, details);
+  if (type == NotificationType::TOKEN_REQUEST_FAILED) {
+    Details<const TokenService::TokenRequestFailedDetails> full = details;
+    details_ = *full.ptr();
+  }
+}
+
 TokenServiceTestHarness::TokenServiceTestHarness()
     : ui_thread_(BrowserThread::UI, &message_loop_),
       db_thread_(BrowserThread::DB) {
 }
 
 TokenServiceTestHarness::~TokenServiceTestHarness() {}
 
 void TokenServiceTestHarness::SetUp() {
 #if defined(OS_MACOSX)
   Encryptor::UseMockKeychain(true);
@@ skipping 302 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