Move extension notifications to extensions/browser/notification_types.h

chrome/browser/extensions/extension_notification_observer.h

Index: chrome/browser/extensions/extension_notification_observer.h
diff --git a/chrome/browser/extensions/extension_notification_observer.h b/chrome/browser/extensions/extension_notification_observer.h
index facb4033f89bee7e83f6a22d4b27a6c884da24ac..b0ce8614bedb1cce8a28f9f4cb7145d5362f8740 100644
--- a/chrome/browser/extensions/extension_notification_observer.h
+++ b/chrome/browser/extensions/extension_notification_observer.h
@@ -33,21 +33,22 @@ class ExtensionNotificationObserver : public content::NotificationObserver {
   // since the last time any of these methods were called.
   testing::AssertionResult CheckNotifications() WARN_UNUSED_RESULT;
   testing::AssertionResult CheckNotifications(
-      chrome::NotificationType type) WARN_UNUSED_RESULT;
+      //NOCOMMIT: All these will become extensions::NotificationType.
+      chrome::ExtensionNotificationType type) WARN_UNUSED_RESULT;
   testing::AssertionResult CheckNotifications(
-      chrome::NotificationType t1,
-      chrome::NotificationType t2) WARN_UNUSED_RESULT;
+      chrome::ExtensionNotificationType t1,
+      chrome::ExtensionNotificationType t2) WARN_UNUSED_RESULT;
   testing::AssertionResult CheckNotifications(
-      chrome::NotificationType t1,
-      chrome::NotificationType t2,
-      chrome::NotificationType t3) WARN_UNUSED_RESULT;
+      chrome::ExtensionNotificationType t1,
+      chrome::ExtensionNotificationType t2,
+      chrome::ExtensionNotificationType t3) WARN_UNUSED_RESULT;
   testing::AssertionResult CheckNotifications(
-      chrome::NotificationType t1,
-      chrome::NotificationType t2,
-      chrome::NotificationType t3,
-      chrome::NotificationType t4,
-      chrome::NotificationType t5,
-      chrome::NotificationType t6) WARN_UNUSED_RESULT;
+      chrome::ExtensionNotificationType t1,
+      chrome::ExtensionNotificationType t2,
+      chrome::ExtensionNotificationType t3,
+      chrome::ExtensionNotificationType t4,
+      chrome::ExtensionNotificationType t5,
+      chrome::ExtensionNotificationType t6) WARN_UNUSED_RESULT;
 
  private:
   // content::NotificationObserver implementation.
@@ -57,10 +58,10 @@ class ExtensionNotificationObserver : public content::NotificationObserver {
 
   // Checks then clears notifications for our extensions.
   testing::AssertionResult CheckNotifications(
-      const std::vector<chrome::NotificationType>& types);
+      const std::vector<chrome::ExtensionNotificationType>& types);
 
   const std::set<std::string> extension_ids_;
-  std::vector<chrome::NotificationType> notifications_;
+  std::vector<chrome::ExtensionNotificationType> notifications_;
   content::NotificationRegistrar registrar_;
 };