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

Unified Diff: chrome/browser/sync/profile_sync_service_password_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
Index: chrome/browser/sync/profile_sync_service_password_unittest.cc
===================================================================
--- chrome/browser/sync/profile_sync_service_password_unittest.cc (revision 91968)
+++ chrome/browser/sync/profile_sync_service_password_unittest.cc (working copy)
@@ -27,6 +27,7 @@
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/syncable/syncable.h"
#include "chrome/browser/sync/test_profile_sync_service.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/sync/engine/test_id_factory.h"
@@ -34,7 +35,6 @@
#include "content/browser/browser_thread.h"
#include "content/common/notification_observer_mock.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "webkit/glue/password_form.h"
@@ -161,10 +161,10 @@
notification_service_ = new ThreadNotificationService(&db_thread_);
notification_service_->Init();
registrar_.Add(&observer_,
- NotificationType::SYNC_CONFIGURE_DONE,
+ chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
NotificationService::AllSources());
registrar_.Add(&observer_,
- NotificationType::SYNC_CONFIGURE_BLOCKED,
+ chrome::NOTIFICATION_SYNC_CONFIGURE_BLOCKED,
NotificationService::AllSources());
}
@@ -222,11 +222,11 @@
EXPECT_CALL(observer_,
Observe(
- NotificationType(NotificationType::SYNC_CONFIGURE_DONE),_,_));
+ int(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),_,_));
EXPECT_CALL(observer_,
Observe(
- NotificationType(
- NotificationType::SYNC_CONFIGURE_BLOCKED),_,_))
+ int(
+ chrome::NOTIFICATION_SYNC_CONFIGURE_BLOCKED),_,_))
.WillOnce(InvokeWithoutArgs(QuitMessageLoop));
service_->RegisterDataTypeController(data_type_controller);

Powered by Google App Engine
This is Rietveld 408576698