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

chrome/browser/webdata/web_data_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.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_test_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/guid.h"
 #include "chrome/test/thread_observer_helper.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
 using testing::_;
 using testing::DoDefault;
 using testing::ElementsAreArray;
 using testing::Pointee;
 using testing::Property;
 
 typedef std::vector<AutofillChange> AutofillChangeList;
 
 static const int kWebDataServiceTimeoutSeconds = 8;
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
 
 class AutofillDBThreadObserverHelper : public DBThreadObserverHelper {
  protected:
   virtual void RegisterObservers() {
     registrar_.Add(&observer_,
-                   NotificationType::AUTOFILL_ENTRIES_CHANGED,
+                   chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
                    NotificationService::AllSources());
     registrar_.Add(&observer_,
-                   NotificationType::AUTOFILL_PROFILE_CHANGED,
+                   chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
                    NotificationService::AllSources());
     registrar_.Add(&observer_,
-                   NotificationType::AUTOFILL_CREDIT_CARD_CHANGED,
+                   chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
                    NotificationService::AllSources());
   }
 };
 
 class WebDataServiceTest : public testing::Test {
  public:
   WebDataServiceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
@@ skipping 78 matching lines @@
 TEST_F(WebDataServiceAutofillTest, FormFillAdd) {
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::ADD, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::ADD, AutofillKey(name2_, value2_))
   };
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_ENTRIES_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
 
   std::vector<webkit_glue::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
   wds_->AddFormFields(form_fields);
 
@@ skipping 25 matching lines @@
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_))
   };
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_ENTRIES_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
   wds_->RemoveFormValueForElementName(name1_, value1_);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 }
 
@@ skipping 12 matching lines @@
   done_event_.TimedWait(test_timeout_);
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::REMOVE, AutofillKey(name2_, value2_))
   };
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_ENTRIES_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillChangeList>::ptr,
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
   wds_->RemoveFormElementsAddedBetween(t, t + one_day);
 
   // The event will be signaled when the mock observer is notified.
   done_event_.TimedWait(test_timeout_);
 }
 
 TEST_F(WebDataServiceAutofillTest, ProfileAdd) {
   AutofillProfile profile;
 
   // Check that GUID-based notification was sent.
   const AutofillProfileChange expected_change(
       AutofillProfileChange::ADD, profile.guid(), &profile);
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_PROFILE_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->AddAutofillProfile(profile);
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was added.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer;
@@ skipping 22 matching lines @@
   EXPECT_EQ(handle, consumer.handle());
   ASSERT_EQ(1U, consumer.result().size());
   EXPECT_EQ(profile, *consumer.result()[0]);
   STLDeleteElements(&consumer.result());
 
   // Check that GUID-based notification was sent.
   const AutofillProfileChange expected_change(
       AutofillProfileChange::REMOVE, profile.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_PROFILE_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Remove the profile.
   wds_->RemoveAutofillProfile(profile.guid());
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was removed.
@@ skipping 27 matching lines @@
   EXPECT_EQ(profile2, *consumer.result()[1]);
   STLDeleteElements(&consumer.result());
 
   AutofillProfile profile1_changed(profile1);
   profile1_changed.SetInfo(NAME_FIRST, ASCIIToUTF16("Bill"));
   const AutofillProfileChange expected_change(
       AutofillProfileChange::UPDATE, profile1.guid(), &profile1_changed);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_PROFILE_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Update the profile.
   wds_->UpdateAutofillProfile(profile1_changed);
   done_event_.TimedWait(test_timeout_);
 
   // Check that the updates were made.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> > consumer2;
   WebDataService::Handle handle2 = wds_->GetAutofillProfiles(&consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, consumer2.handle());
   ASSERT_EQ(2U, consumer2.result().size());
   EXPECT_NE(profile1, *consumer2.result()[0]);
   EXPECT_EQ(profile1_changed, *consumer2.result()[0]);
   EXPECT_EQ(profile2, *consumer2.result()[1]);
   STLDeleteElements(&consumer2.result());
 }
 
 TEST_F(WebDataServiceAutofillTest, CreditAdd) {
   CreditCard card;
   const AutofillCreditCardChange expected_change(
       AutofillCreditCardChange::ADD, card.guid(), &card);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(
-          NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
+          int(chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->AddCreditCard(card);
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was added.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer;
@@ skipping 22 matching lines @@
   ASSERT_EQ(1U, consumer.result().size());
   EXPECT_EQ(credit_card, *consumer.result()[0]);
   STLDeleteElements(&consumer.result());
 
   // Remove the credit card.
   const AutofillCreditCardChange expected_change(
       AutofillCreditCardChange::REMOVE, credit_card.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(
-          NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
+          int(chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
   wds_->RemoveCreditCard(credit_card.guid());
   done_event_.TimedWait(test_timeout_);
 
   // Check that it was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer2;
   WebDataService::Handle handle2 = wds_->GetCreditCards(&consumer2);
@@ skipping 27 matching lines @@
   STLDeleteElements(&consumer.result());
 
   CreditCard card1_changed(card1);
   card1_changed.SetInfo(CREDIT_CARD_NAME, ASCIIToUTF16("Bill"));
   const AutofillCreditCardChange expected_change(
       AutofillCreditCardChange::UPDATE, card1.guid(), &card1_changed);
 
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(
-          NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
+          int(chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   wds_->UpdateCreditCard(card1_changed);
   done_event_.TimedWait(test_timeout_);
 
   // Check that the updates were made.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > consumer2;
@@ skipping 41 matching lines @@
   EXPECT_EQ(handle, card_consumer.handle());
   ASSERT_EQ(1U, card_consumer.result().size());
   EXPECT_EQ(credit_card, *card_consumer.result()[0]);
   STLDeleteElements(&card_consumer.result());
 
   // Check that GUID-based notification was sent for the profile.
   const AutofillProfileChange expected_profile_change(
       AutofillProfileChange::REMOVE, profile.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
-      Observe(NotificationType(NotificationType::AUTOFILL_PROFILE_CHANGED),
+      Observe(int(chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillProfileChange>::ptr,
                        Pointee(expected_profile_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Check that GUID-based notification was sent for the credit card.
   const AutofillCreditCardChange expected_card_change(
       AutofillCreditCardChange::REMOVE, credit_card.guid(), NULL);
   EXPECT_CALL(
       *observer_helper_->observer(),
       Observe(
-          NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED),
+          int(chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED),
               Source<WebDataService>(wds_.get()),
               Property(&Details<const AutofillCreditCardChange>::ptr,
                        Pointee(expected_card_change)))).
       WillOnce(SignalEvent(&done_event_));
 
   // Remove the profile using time range of "all time".
   wds_->RemoveAutofillProfilesAndCreditCardsModifiedBetween(Time(), Time());
   done_event_.TimedWait(test_timeout_);
   done_event_.TimedWait(test_timeout_);
 
   // Check that the profile was removed.
   AutofillWebDataServiceConsumer<std::vector<AutofillProfile*> >
       profile_consumer2;
   WebDataService::Handle handle2 =
       wds_->GetAutofillProfiles(&profile_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, profile_consumer2.handle());
   ASSERT_EQ(0U, profile_consumer2.result().size());
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> >
       card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }