Moving notification types which are chrome specific to a new header file chrome_notification_type...

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_notification_types.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 "content/common/test_url_fetcher_factory.h"
 
 TokenAvailableTracker::TokenAvailableTracker() {}
 
 TokenAvailableTracker::~TokenAvailableTracker() {}
 
-void TokenAvailableTracker::Observe(NotificationType type,
+void TokenAvailableTracker::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   TestNotificationTracker::Observe(type, source, details);
-  if (type == NotificationType::TOKEN_AVAILABLE) {
+  if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     Details<const TokenService::TokenAvailableDetails> full = details;
     details_ = *full.ptr();
   }
 }
 
 TokenFailedTracker::TokenFailedTracker() {}
 
 TokenFailedTracker::~TokenFailedTracker() {}
 
-void TokenFailedTracker::Observe(NotificationType type,
+void TokenFailedTracker::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   TestNotificationTracker::Observe(type, source, details);
-  if (type == NotificationType::TOKEN_REQUEST_FAILED) {
+  if (type == chrome::NOTIFICATION_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);
 #endif
   credentials_.sid = "sid";
   credentials_.lsid = "lsid";
   credentials_.token = "token";
   credentials_.data = "data";
 
   ASSERT_TRUE(db_thread_.Start());
 
   profile_.reset(new TestingProfile());
   profile_->CreateWebDataService(false);
   WaitForDBLoadCompletion();
 
-  success_tracker_.ListenFor(NotificationType::TOKEN_AVAILABLE,
+  success_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_AVAILABLE,
                              Source<TokenService>(&service_));
-  failure_tracker_.ListenFor(NotificationType::TOKEN_REQUEST_FAILED,
+  failure_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                              Source<TokenService>(&service_));
 
   service_.Initialize("test", profile_.get());
 
   URLFetcher::set_factory(NULL);
 }
 
 void TokenServiceTestHarness::TearDown() {
   // You have to destroy the profile before the db_thread_ stops.
   if (profile_.get()) {
@@ skipping 277 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