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

chrome/browser/password_manager/password_store_x_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.
 
 #include "base/basictypes.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
@@ skipping 60 matching lines @@
   NotificationObserverMock& observer() {
     return observer_;
   }
 
  protected:
   friend class base::RefCountedThreadSafe<DBThreadObserverHelper>;
 
   void AddObserverTask() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
     registrar_.Add(&observer_,
-                   NotificationType::LOGINS_CHANGED,
+                   chrome::LOGINS_CHANGED,
                    NotificationService::AllSources());
     done_event_.Signal();
   }
 
   WaitableEvent done_event_;
   NotificationRegistrar registrar_;
   NotificationObserverMock observer_;
 };
 
 class FailingBackend : public PasswordStoreX::NativeBackend {
@@ skipping 442 matching lines @@
   scoped_ptr<PasswordForm> form(CreatePasswordFormFromData(form_data));
 
   scoped_refptr<DBThreadObserverHelper> helper = new DBThreadObserverHelper;
   helper->Init();
 
   const PasswordStoreChange expected_add_changes[] = {
     PasswordStoreChange(PasswordStoreChange::ADD, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(NotificationType(NotificationType::LOGINS_CHANGED),
+              Observe(int(chrome::LOGINS_CHANGED),
                       NotificationService::AllSources(),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_add_changes)))));
 
   // Adding a login should trigger a notification.
   store->AddLogin(*form);
 
   // The PasswordStore schedules tasks to run on the DB thread so we schedule
   // yet another task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   // Change the password.
   form->password_value = WideToUTF16(L"a different password");
 
   const PasswordStoreChange expected_update_changes[] = {
     PasswordStoreChange(PasswordStoreChange::UPDATE, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(NotificationType(NotificationType::LOGINS_CHANGED),
+              Observe(int(chrome::LOGINS_CHANGED),
                       NotificationService::AllSources(),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_update_changes)))));
 
   // Updating the login with the new password should trigger a notification.
   store->UpdateLogin(*form);
 
   // Wait for PasswordStore to send the notification.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       new SignalingTask(&done));
   done.Wait();
 
   const PasswordStoreChange expected_delete_changes[] = {
     PasswordStoreChange(PasswordStoreChange::REMOVE, *form),
   };
 
   EXPECT_CALL(helper->observer(),
-              Observe(NotificationType(NotificationType::LOGINS_CHANGED),
+              Observe(int(chrome::LOGINS_CHANGED),
                       NotificationService::AllSources(),
                       Property(&Details<const PasswordStoreChangeList>::ptr,
                                Pointee(ElementsAreArray(
                                    expected_delete_changes)))));
 
   // Deleting the login should trigger a notification.
   store->RemoveLogin(*form);
 
   // Wait for PasswordStore to send the notification.
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
@@ skipping 147 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(NoBackend,
                         PasswordStoreXTest,
                         testing::Values(NO_BACKEND));
 INSTANTIATE_TEST_CASE_P(FailingBackend,
                         PasswordStoreXTest,
                         testing::Values(FAILING_BACKEND));
 INSTANTIATE_TEST_CASE_P(WorkingBackend,
                         PasswordStoreXTest,
                         testing::Values(WORKING_BACKEND));