Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2314)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/webdata/web_data_service_unittest.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/webdata/web_data_service.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_data_service_unittest.cc
===================================================================
--- chrome/browser/webdata/web_data_service_unittest.cc (revision 91968)
+++ chrome/browser/webdata/web_data_service_unittest.cc (working copy)
@@ -24,13 +24,13 @@
#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"
@@ -56,13 +56,13 @@
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());
}
};
@@ -161,7 +161,7 @@
// 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))))).
@@ -207,7 +207,7 @@
};
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))))).
@@ -240,7 +240,7 @@
};
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))))).
@@ -259,7 +259,7 @@
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)))).
@@ -302,7 +302,7 @@
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)))).
@@ -350,7 +350,7 @@
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)))).
@@ -380,7 +380,7 @@
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)))).
@@ -423,7 +423,7 @@
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)))).
@@ -471,7 +471,7 @@
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)))).
@@ -533,7 +533,7 @@
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)))).
@@ -545,7 +545,7 @@
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)))).
« no previous file with comments | « chrome/browser/webdata/web_data_service.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698