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

This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h

BUG=76698
Review URL: http://codereview.chromium.org/7327007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98

90 files changed, 448 insertions, 415 deletions

diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index e9a970b..fee47f7 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
@@ -37,7 +38,7 @@ class BrowserActionApiTest : public ExtensionApiTest {
     ResultCatcher catcher;
     GetBrowserActionsBar().Press(index);
     ui_test_utils::WaitForNotification(
-        NotificationType::EXTENSION_POPUP_VIEW_READY);
+        chrome::NOTIFICATION_EXTENSION_POPUP_VIEW_READY);
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
     return GetBrowserActionsBar().HasPopup();
   }
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index 6221bbe..36a0269 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -6,6 +6,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/ui_test_utils.h"
 #include "googleurl/src/gurl.h"
@@ -69,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(
   ASSERT_TRUE(StartTestServer());
 
   ui_test_utils::WindowedNotificationObserver signal(
-      NotificationType::USER_SCRIPTS_UPDATED,
+      chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
       Source<Profile>(browser()->profile()));
 
   // Start with a renderer already open at a URL.
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc
index e923e90..a8405b1 100644
--- a/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -10,11 +10,11 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/in_process_browser_test.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
-#include "content/common/notification_type.h"
 
 class ExtensionFromWebAppTest
     : public InProcessBrowserTest, public NotificationObserver {
@@ -32,10 +32,10 @@ class ExtensionFromWebAppTest
   }
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    if (type == NotificationType::EXTENSION_INSTALLED) {
+    if (type == chrome::NOTIFICATION_EXTENSION_INSTALLED) {
       const Extension* extension = Details<const Extension>(details).ptr();
       if (extension->id() == expected_extension_id_) {
         installed_extension_ = extension;
@@ -51,7 +51,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionFromWebAppTest, Basic) {
       false);
 
   NotificationRegistrar registrar;
-  registrar.Add(this, NotificationType::EXTENSION_INSTALLED,
+  registrar.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
                 NotificationService::AllSources());
 
   expected_extension_id_ = "fnpgoaochgbdfjndakichfafiocjjpmm";
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 16490c7..3581571 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -26,12 +26,12 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -438,7 +438,7 @@ void CrxInstaller::InstallUIAbort(bool user_initiated) {
 
   // Kill the theme loading bubble.
   NotificationService* service = NotificationService::current();
-  service->Notify(NotificationType::NO_THEME_DETECTED,
+  service->Notify(chrome::NOTIFICATION_NO_THEME_DETECTED,
                   Source<CrxInstaller>(this),
                   NotificationService::NoDetails());
   Release();  // balanced in ConfirmInstall().
@@ -511,7 +511,7 @@ void CrxInstaller::ReportFailureFromUIThread(const std::string& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   NotificationService* service = NotificationService::current();
-  service->Notify(NotificationType::EXTENSION_INSTALL_ERROR,
+  service->Notify(chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                   Source<CrxInstaller>(this),
                   Details<const std::string>(&error));
 
@@ -572,7 +572,7 @@ void CrxInstaller::NotifyCrxInstallComplete() {
   // extension before it is unpacked, so they can not filter based
   // on the extension.
   NotificationService::current()->Notify(
-      NotificationType::CRX_INSTALLER_DONE,
+      chrome::NOTIFICATION_CRX_INSTALLER_DONE,
       Source<CrxInstaller>(this),
       NotificationService::NoDetails());
 }
diff --git a/chrome/browser/extensions/extension_accessibility_api.cc b/chrome/browser/extensions/extension_accessibility_api.cc
index cc694d1..6b00cc8 100644
--- a/chrome/browser/extensions/extension_accessibility_api.cc
+++ b/chrome/browser/extensions/extension_accessibility_api.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_service.h"
 
@@ -52,53 +53,53 @@ void ExtensionAccessibilityEventRouter::ObserveProfile(Profile* profile) {
 
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_WINDOW_OPENED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_WINDOW_CLOSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_CONTROL_FOCUSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_CONTROL_ACTION,
+                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_TEXT_CHANGED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_MENU_OPENED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
                    NotificationService::AllSources());
     registrar_.Add(this,
-                   NotificationType::ACCESSIBILITY_MENU_CLOSED,
+                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
                    NotificationService::AllSources());
   }
 }
 
 void ExtensionAccessibilityEventRouter::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::ACCESSIBILITY_WINDOW_OPENED:
+  switch (type) {
+    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED:
       OnWindowOpened(Details<const AccessibilityWindowInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_WINDOW_CLOSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED:
       OnWindowClosed(Details<const AccessibilityWindowInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_CONTROL_FOCUSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED:
       OnControlFocused(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_CONTROL_ACTION:
+    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION:
       OnControlAction(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_TEXT_CHANGED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED:
       OnTextChanged(Details<const AccessibilityControlInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_MENU_OPENED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED:
       OnMenuOpened(Details<const AccessibilityMenuInfo>(details).ptr());
       break;
-    case NotificationType::ACCESSIBILITY_MENU_CLOSED:
+    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED:
       OnMenuClosed(Details<const AccessibilityMenuInfo>(details).ptr());
       break;
     default:
diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h
index 2dfc4c1..62125f7 100644
--- a/chrome/browser/extensions/extension_accessibility_api.h
+++ b/chrome/browser/extensions/extension_accessibility_api.h
@@ -51,7 +51,7 @@ class ExtensionAccessibilityEventRouter : public NotificationObserver {
   virtual ~ExtensionAccessibilityEventRouter();
 
   // NotificationObserver::Observe.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 30cb96e..e66c0a3 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_test_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_registrar.h"
 
@@ -26,9 +27,9 @@ ExtensionApiTest::~ExtensionApiTest() {}
 ExtensionApiTest::ResultCatcher::ResultCatcher()
     : profile_restriction_(NULL),
       waiting_(false) {
-  registrar_.Add(this, NotificationType::EXTENSION_TEST_PASSED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_PASSED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_TEST_FAILED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_FAILED,
                  NotificationService::AllSources());
 }
 
@@ -59,15 +60,15 @@ bool ExtensionApiTest::ResultCatcher::GetNextResult() {
 }
 
 void ExtensionApiTest::ResultCatcher::Observe(
-    NotificationType type, const NotificationSource& source,
+    int type, const NotificationSource& source,
     const NotificationDetails& details) {
   if (profile_restriction_ &&
       Source<Profile>(source).ptr() != profile_restriction_) {
     return;
   }
 
-  switch (type.value) {
-    case NotificationType::EXTENSION_TEST_PASSED:
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_TEST_PASSED:
       VLOG(1) << "Got EXTENSION_TEST_PASSED notification.";
       results_.push_back(true);
       messages_.push_back("");
@@ -75,7 +76,7 @@ void ExtensionApiTest::ResultCatcher::Observe(
         MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_TEST_FAILED:
+    case chrome::NOTIFICATION_EXTENSION_TEST_FAILED:
       VLOG(1) << "Got EXTENSION_TEST_FAILED notification.";
       results_.push_back(false);
       messages_.push_back(*(Details<std::string>(details).ptr()));
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index d6e458f..aac6727 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -49,7 +49,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
     const std::string& message() { return message_; }
 
    private:
-    virtual void Observe(NotificationType type,
+    virtual void Observe(int type,
                          const NotificationSource& source,
                          const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_app_api.cc b/chrome/browser/extensions/extension_app_api.cc
index b5e8c12..24cc2ed 100644
--- a/chrome/browser/extensions/extension_app_api.cc
+++ b/chrome/browser/extensions/extension_app_api.cc
@@ -8,10 +8,10 @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/render_messages.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 
 const char kBodyTextKey[] = "bodyText";
@@ -29,7 +29,7 @@ AppNotification::~AppNotification() {}
 
 AppNotificationManager::AppNotificationManager() {
   registrar_.Add(this,
-                 NotificationType::EXTENSION_UNINSTALLED,
+                 chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  NotificationService::AllSources());
 }
 
@@ -69,10 +69,10 @@ void AppNotificationManager::ClearAll(const std::string& extension_id) {
     notifications_.erase(found);
 }
 
-void AppNotificationManager::Observe(NotificationType type,
+void AppNotificationManager::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
-  CHECK(type == NotificationType::EXTENSION_UNINSTALLED);
+  CHECK(type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED);
   const std::string& id =
       Details<UninstalledExtensionInfo>(details)->extension_id;
   ClearAll(id);
@@ -125,7 +125,7 @@ bool AppNotifyFunction::RunImpl() {
   manager->Add(item.release());
 
   NotificationService::current()->Notify(
-      NotificationType::APP_NOTIFICATION_STATE_CHANGED,
+      chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,
       Source<Profile>(profile_),
       Details<const std::string>(&extension_id()));
 
@@ -137,7 +137,7 @@ bool AppClearAllNotificationsFunction::RunImpl() {
       profile()->GetExtensionService()->app_notification_manager();
   manager->ClearAll(extension_id());
   NotificationService::current()->Notify(
-      NotificationType::APP_NOTIFICATION_STATE_CHANGED,
+      chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,
       Source<Profile>(profile_),
       Details<const std::string>(&extension_id()));
   return true;
diff --git a/chrome/browser/extensions/extension_app_api.h b/chrome/browser/extensions/extension_app_api.h
index 3e6b22c..c0c9413 100644
--- a/chrome/browser/extensions/extension_app_api.h
+++ b/chrome/browser/extensions/extension_app_api.h
@@ -50,7 +50,7 @@ class AppNotificationManager : public NotificationObserver {
   void ClearAll(const std::string& extension_id);
 
   // Implementing NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index c61c8dd..1a1ab791 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_service.h"
@@ -77,7 +78,7 @@ void BookmarksFunction::Run() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   if (!model->IsLoaded()) {
     // Bookmarks are not ready yet.  We'll wait.
-    registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
                    NotificationService::AllSources());
     AddRef();  // Balanced in Observe().
     return;
@@ -86,7 +87,7 @@ void BookmarksFunction::Run() {
   bool success = RunImpl();
   if (success) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_BOOKMARKS_API_INVOKED,
+        chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
         Source<const Extension>(GetExtension()),
         Details<const BookmarksFunction>(this));
   }
@@ -109,10 +110,10 @@ bool BookmarksFunction::EditBookmarksEnabled() {
   return false;
 }
 
-void BookmarksFunction::Observe(NotificationType type,
+void BookmarksFunction::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  DCHECK(type == NotificationType::BOOKMARK_MODEL_LOADED);
+  DCHECK(type == chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED);
   DCHECK(profile()->GetBookmarkModel()->IsLoaded());
   Run();
   Release();  // Balanced in Run().
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h
index 079656e..0aecb29 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/extensions/extension_bookmarks_module.h
@@ -84,7 +84,7 @@ class BookmarksFunction : public AsyncExtensionFunction,
 
  private:
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc
index 3cf1499..750d121 100644
--- a/chrome/browser/extensions/extension_browser_actions_api.cc
+++ b/chrome/browser/extensions/extension_browser_actions_api.cc
@@ -8,6 +8,7 @@
 
 #include "base/values.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/render_messages.h"
 #include "content/common/notification_service.h"
@@ -38,7 +39,7 @@ bool BrowserActionFunction::RunImpl() {
     return false;
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
+      chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
       Source<ExtensionAction>(browser_action_),
       NotificationService::NoDetails());
   return true;
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index e510b2d..66a2cf0 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/tab_contents/navigation_entry.h"
@@ -72,7 +73,7 @@ void ExtensionBrowserEventRouter::Init() {
 #elif defined(OS_MACOSX)
   // Needed for when no suitable window can be passed to an extension as the
   // currently focused window.
-  registrar_.Add(this, NotificationType::NO_KEY_WINDOW,
+  registrar_.Add(this, content::NOTIFICATION_NO_KEY_WINDOW,
                  NotificationService::AllSources());
 #endif
 
@@ -127,7 +128,7 @@ void ExtensionBrowserEventRouter::RegisterForBrowserNotifications(
   // If this is a new window, it isn't ready at this point, so we register to be
   // notified when it is. If this is an existing window, this is a no-op that we
   // just do to reduce code complexity.
-  registrar_.Add(this, NotificationType::BROWSER_WINDOW_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       Source<const Browser>(browser));
 
   for (int i = 0; i < browser->tabstrip_model()->count(); ++i)
@@ -136,22 +137,22 @@ void ExtensionBrowserEventRouter::RegisterForBrowserNotifications(
 
 void ExtensionBrowserEventRouter::RegisterForTabNotifications(
     TabContents* contents) {
-  registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  Source<NavigationController>(&contents->controller()));
 
   // Observing TAB_CONTENTS_DESTROYED is necessary because it's
   // possible for tabs to be created, detached and then destroyed without
   // ever having been re-attached and closed. This happens in the case of
   // a devtools TabContents that is opened in window, docked, then closed.
-  registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
+  registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  Source<TabContents>(contents));
 }
 
 void ExtensionBrowserEventRouter::UnregisterForTabNotifications(
     TabContents* contents) {
-  registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
+  registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       Source<NavigationController>(&contents->controller()));
-  registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
+  registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
       Source<TabContents>(contents));
 }
 
@@ -175,7 +176,7 @@ void ExtensionBrowserEventRouter::OnBrowserRemoved(const Browser* browser) {
   // Stop listening to TabStripModel events for this browser.
   browser->tabstrip_model()->RemoveObserver(this);
 
-  registrar_.Remove(this, NotificationType::BROWSER_WINDOW_READY,
+  registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
       Source<const Browser>(browser));
 
   DispatchSimpleBrowserEvent(browser->profile(),
@@ -487,25 +488,25 @@ ExtensionBrowserEventRouter::TabEntry* ExtensionBrowserEventRouter::GetTabEntry(
   return &i->second;
 }
 
-void ExtensionBrowserEventRouter::Observe(NotificationType type,
+void ExtensionBrowserEventRouter::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  if (type == NotificationType::NAV_ENTRY_COMMITTED) {
+  if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         Source<NavigationController>(source).ptr();
     TabUpdated(source_controller->tab_contents(), true);
-  } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
+  } else if (type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
     // Tab was destroyed after being detached (without being re-attached).
     TabContents* contents = Source<TabContents>(source).ptr();
-    registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
+    registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         Source<NavigationController>(&contents->controller()));
-    registrar_.Remove(this, NotificationType::TAB_CONTENTS_DESTROYED,
+    registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
         Source<TabContents>(contents));
-  } else if (type == NotificationType::BROWSER_WINDOW_READY) {
+  } else if (type == chrome::NOTIFICATION_BROWSER_WINDOW_READY) {
     const Browser* browser = Source<const Browser>(source).ptr();
     OnBrowserWindowReady(browser);
 #if defined(OS_MACOSX)
-  } else if (type == NotificationType::NO_KEY_WINDOW) {
+  } else if (type == content::NOTIFICATION_NO_KEY_WINDOW) {
     OnBrowserSetLastActive(NULL);
 #endif
   } else {
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index eda06a6..ddd878b 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -92,7 +92,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
                              Browser* browser);
 
   // NotificationObserver.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
  private:
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index fed530d..540b8e3 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -22,12 +22,12 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 ExtensionBrowserTest::ExtensionBrowserTest()
     : loaded_(false),
@@ -64,7 +64,7 @@ const Extension* ExtensionBrowserTest::LoadExtensionImpl(
   ExtensionService* service = browser()->profile()->GetExtensionService();
   {
     NotificationRegistrar registrar;
-    registrar.Add(this, NotificationType::EXTENSION_LOADED,
+    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                   NotificationService::AllSources());
     service->LoadExtension(path);
     ui_test_utils::RunMessageLoop();
@@ -94,7 +94,7 @@ const Extension* ExtensionBrowserTest::LoadExtensionImpl(
   service->SetIsIncognitoEnabled(extension_id, incognito_enabled);
 
   ui_test_utils::WindowedNotificationObserver extension_loaded_signal(
-      NotificationType::EXTENSION_LOADED,
+      chrome::NOTIFICATION_EXTENSION_LOADED,
       Source<Profile>(browser()->profile()));
   service->SetAllowFileAccess(extension, fileaccess_enabled);
 
@@ -226,11 +226,11 @@ bool ExtensionBrowserTest::InstallOrUpdateExtension(const std::string& id,
 
   {
     NotificationRegistrar registrar;
-    registrar.Add(this, NotificationType::EXTENSION_LOADED,
+    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                   NotificationService::AllSources());
-    registrar.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
+    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
                   NotificationService::AllSources());
-    registrar.Add(this, NotificationType::EXTENSION_INSTALL_ERROR,
+    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                   NotificationService::AllSources());
 
     ExtensionInstallUI* install_ui = NULL;
@@ -284,7 +284,7 @@ void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) {
   ExtensionService* service = browser()->profile()->GetExtensionService();
   service->ReloadExtension(extension_id);
   ui_test_utils::RegisterAndWait(this,
-                                 NotificationType::EXTENSION_LOADED,
+                                 chrome::NOTIFICATION_EXTENSION_LOADED,
                                  NotificationService::AllSources());
 }
 
@@ -314,7 +314,7 @@ bool ExtensionBrowserTest::WaitForPageActionCountChangeTo(int count) {
   if (location_bar->PageActionCount() != count) {
     target_page_action_count_ = count;
     ui_test_utils::RegisterAndWait(this,
-        NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED,
+        chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
         NotificationService::AllSources());
   }
   return location_bar->PageActionCount() == count;
@@ -326,7 +326,7 @@ bool ExtensionBrowserTest::WaitForPageActionVisibilityChangeTo(int count) {
   if (location_bar->PageActionVisibleCount() != count) {
     target_visible_page_action_count_ = count;
     ui_test_utils::RegisterAndWait(this,
-        NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
+        chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
         NotificationService::AllSources());
   }
   return location_bar->PageActionVisibleCount() == count;
@@ -335,7 +335,7 @@ bool ExtensionBrowserTest::WaitForPageActionVisibilityChangeTo(int count) {
 bool ExtensionBrowserTest::WaitForExtensionHostsToLoad() {
   // Wait for all the extension hosts that exist to finish loading.
   NotificationRegistrar registrar;
-  registrar.Add(this, NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+  registrar.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                 NotificationService::AllSources());
 
   ExtensionProcessManager* manager =
@@ -358,7 +358,8 @@ bool ExtensionBrowserTest::WaitForExtensionHostsToLoad() {
 
 bool ExtensionBrowserTest::WaitForExtensionInstall() {
   int before = extension_installs_observed_;
-  ui_test_utils::RegisterAndWait(this, NotificationType::EXTENSION_INSTALLED,
+  ui_test_utils::RegisterAndWait(this,
+                                 chrome::NOTIFICATION_EXTENSION_INSTALLED,
                                  NotificationService::AllSources());
   return extension_installs_observed_ == (before + 1);
 }
@@ -366,13 +367,13 @@ bool ExtensionBrowserTest::WaitForExtensionInstall() {
 bool ExtensionBrowserTest::WaitForExtensionInstallError() {
   int before = extension_installs_observed_;
   ui_test_utils::RegisterAndWait(this,
-                                 NotificationType::EXTENSION_INSTALL_ERROR,
+                                 chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                                  NotificationService::AllSources());
   return extension_installs_observed_ == before;
 }
 
 void ExtensionBrowserTest::WaitForExtensionLoad() {
-  ui_test_utils::RegisterAndWait(this, NotificationType::EXTENSION_LOADED,
+  ui_test_utils::RegisterAndWait(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                                  NotificationService::AllSources());
   WaitForExtensionHostsToLoad();
 }
@@ -385,54 +386,54 @@ bool ExtensionBrowserTest::WaitForExtensionCrash(
     // The extension is already unloaded, presumably due to a crash.
     return true;
   }
-  ui_test_utils::RegisterAndWait(this,
-                                 NotificationType::EXTENSION_PROCESS_TERMINATED,
-                                 NotificationService::AllSources());
+  ui_test_utils::RegisterAndWait(
+      this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
+      NotificationService::AllSources());
   return (service->GetExtensionById(extension_id, true) == NULL);
 }
 
-void ExtensionBrowserTest::Observe(NotificationType type,
+void ExtensionBrowserTest::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::EXTENSION_LOADED:
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_LOADED:
       last_loaded_extension_id_ = Details<const Extension>(details).ptr()->id();
       VLOG(1) << "Got EXTENSION_LOADED notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_UPDATE_DISABLED:
+    case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
       VLOG(1) << "Got EXTENSION_UPDATE_DISABLED notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_HOST_DID_STOP_LOADING:
+    case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
       VLOG(1) << "Got EXTENSION_HOST_DID_STOP_LOADING notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_INSTALLED:
+    case chrome::NOTIFICATION_EXTENSION_INSTALLED:
       VLOG(1) << "Got EXTENSION_INSTALLED notification.";
       ++extension_installs_observed_;
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_INSTALL_ERROR:
+    case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR:
       VLOG(1) << "Got EXTENSION_INSTALL_ERROR notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_PROCESS_CREATED:
+    case chrome::NOTIFICATION_EXTENSION_PROCESS_CREATED:
       VLOG(1) << "Got EXTENSION_PROCESS_CREATED notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_PROCESS_TERMINATED:
+    case chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED:
       VLOG(1) << "Got EXTENSION_PROCESS_TERMINATED notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
-    case NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED: {
+    case chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED: {
       LocationBarTesting* location_bar =
           browser()->window()->GetLocationBar()->GetLocationBarForTesting();
       VLOG(1) << "Got EXTENSION_PAGE_ACTION_COUNT_CHANGED notification. Number "
@@ -445,7 +446,7 @@ void ExtensionBrowserTest::Observe(NotificationType type,
       break;
     }
 
-    case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
+    case chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
       LocationBarTesting* location_bar =
           browser()->window()->GetLocationBar()->GetLocationBarForTesting();
       VLOG(1) << "Got EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED notification. "
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 93e3627..c76701a 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -12,9 +12,9 @@
 #include "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/test/in_process_browser_test.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_observer.h"
-#include "content/common/notification_type.h"
 
 class Extension;
 
@@ -112,7 +112,7 @@ class ExtensionBrowserTest
   bool WaitForExtensionCrash(const std::string& extension_id);
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc
index 75c3ea6..a462172 100644
--- a/chrome/browser/extensions/extension_cookies_api.cc
+++ b/chrome/browser/extensions/extension_cookies_api.cc
@@ -14,11 +14,11 @@
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -33,19 +33,19 @@ ExtensionCookiesEventRouter::~ExtensionCookiesEventRouter() {}
 void ExtensionCookiesEventRouter::Init() {
   CHECK(registrar_.IsEmpty());
   registrar_.Add(this,
-                 NotificationType::COOKIE_CHANGED,
+                 chrome::NOTIFICATION_COOKIE_CHANGED,
                  NotificationService::AllSources());
 }
 
-void ExtensionCookiesEventRouter::Observe(NotificationType type,
+void ExtensionCookiesEventRouter::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   Profile* profile = Source<Profile>(source).ptr();
   if (!profile_->IsSameProfile(profile)) {
     return;
   }
-  switch (type.value) {
-    case NotificationType::COOKIE_CHANGED:
+  switch (type) {
+    case chrome::NOTIFICATION_COOKIE_CHANGED:
       CookieChanged(
           profile,
           Details<ChromeCookieDetails>(details).ptr());
diff --git a/chrome/browser/extensions/extension_cookies_api.h b/chrome/browser/extensions/extension_cookies_api.h
index 5d4fc13..fbeaf83 100644
--- a/chrome/browser/extensions/extension_cookies_api.h
+++ b/chrome/browser/extensions/extension_cookies_api.h
@@ -37,7 +37,7 @@ class ExtensionCookiesEventRouter : public NotificationObserver {
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index 2183c1f7..8c6adc8 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -24,6 +24,7 @@
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/notification_service.h"
 
@@ -53,7 +54,7 @@ class ExtensionDevToolsClientHost : public DevToolsClientHost,
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
   void OnDispatchOnInspectorFrontend(const std::string& data);
@@ -116,7 +117,7 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
   AttachedClientHosts::GetInstance()->Add(this);
 
   // Detach from debugger when extension unloads.
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(tab_contents_->profile()));
 
   // Attach to debugger and tell it we are ready.
@@ -194,10 +195,10 @@ void ExtensionDevToolsClientHost::SendMessageToBackend(
 }
 
 void ExtensionDevToolsClientHost::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  DCHECK(type == NotificationType::EXTENSION_UNLOADED);
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED);
   Close();
 }
 
diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
index 1b92ac0..14f8a80 100644
--- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -97,7 +98,7 @@ class ExtensionDisabledInfobarDelegate : public ConfirmInfoBarDelegate,
   virtual bool Accept() OVERRIDE;
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
@@ -116,9 +117,9 @@ ExtensionDisabledInfobarDelegate::ExtensionDisabledInfobarDelegate(
       service_(service),
       extension_(extension) {
   // The user might re-enable the extension in other ways, so watch for that.
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  Source<Profile>(service->profile()));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(service->profile()));
 }
 
@@ -150,16 +151,16 @@ bool ExtensionDisabledInfobarDelegate::Accept() {
 }
 
 void ExtensionDisabledInfobarDelegate::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   // TODO(mpcomplete): RemoveInfoBar doesn't seem to always result in us getting
   // deleted.
   const Extension* extension = NULL;
-  if (type.value == NotificationType::EXTENSION_LOADED) {
+  if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
     extension = Details<const Extension>(details).ptr();
   } else {
-    DCHECK_EQ(NotificationType::EXTENSION_UNLOADED, type.value);
+    DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNLOADED, type);
     UnloadedExtensionInfo* info = Details<UnloadedExtensionInfo>(details).ptr();
     if (info->reason == UnloadedExtensionInfo::DISABLE ||
         info->reason == UnloadedExtensionInfo::UNINSTALL)
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index f7663be..fcfe551 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -65,9 +65,9 @@ void ExtensionEventRouter::DispatchEvent(IPC::Message::Sender* ipc_sender,
 ExtensionEventRouter::ExtensionEventRouter(Profile* profile)
     : profile_(profile),
       extension_devtools_manager_(profile->GetExtensionDevToolsManager()) {
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
 }
 
@@ -221,12 +221,12 @@ void ExtensionEventRouter::DispatchEventImpl(
   }
 }
 
-void ExtensionEventRouter::Observe(NotificationType type,
+void ExtensionEventRouter::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::RENDERER_PROCESS_TERMINATED:
-    case NotificationType::RENDERER_PROCESS_CLOSED: {
+  switch (type) {
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       RenderProcessHost* renderer = Source<RenderProcessHost>(source).ptr();
       // Remove all event listeners associated with this renderer
       for (ListenerMap::iterator it = listeners_.begin();
diff --git a/chrome/browser/extensions/extension_event_router.h b/chrome/browser/extensions/extension_event_router.h
index 51ee249..d46e05f 100644
--- a/chrome/browser/extensions/extension_event_router.h
+++ b/chrome/browser/extensions/extension_event_router.h
@@ -101,7 +101,7 @@ class ExtensionEventRouter : public NotificationObserver {
   // An extension listening to an event.
   struct EventListener;
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc
index fbb6c03a..c12f3fc 100644
--- a/chrome/browser/extensions/extension_function.cc
+++ b/chrome/browser/extensions/extension_function.cc
@@ -14,8 +14,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/user_metrics.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "content/common/result_codes.h"
 
 // static
@@ -27,15 +27,15 @@ UIThreadExtensionFunction::RenderViewHostTracker::RenderViewHostTracker(
     UIThreadExtensionFunction* function)
     : function_(function) {
   registrar_.Add(this,
-                 NotificationType::RENDER_VIEW_HOST_DELETED,
+                 content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
                  Source<RenderViewHost>(function->render_view_host()));
 }
 
 void UIThreadExtensionFunction::RenderViewHostTracker::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  CHECK(type == NotificationType::RENDER_VIEW_HOST_DELETED);
+  CHECK(type == content::NOTIFICATION_RENDER_VIEW_HOST_DELETED);
   CHECK(Source<RenderViewHost>(source).ptr() ==
         function_->render_view_host());
   function_->SetRenderViewHost(NULL);
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index c57f0b1..bffffdb7 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -263,7 +263,7 @@ class UIThreadExtensionFunction : public ExtensionFunction {
    public:
     explicit RenderViewHostTracker(UIThreadExtensionFunction* function);
    private:
-    virtual void Observe(NotificationType type,
+    virtual void Observe(int type,
                          const NotificationSource& source,
                          const NotificationDetails& details);
     UIThreadExtensionFunction* function_;
diff --git a/chrome/browser/extensions/extension_gallery_install_apitest.cc b/chrome/browser/extensions/extension_gallery_install_apitest.cc
index 2a0b8be..0b2117b 100644
--- a/chrome/browser/extensions/extension_gallery_install_apitest.cc
+++ b/chrome/browser/extensions/extension_gallery_install_apitest.cc
@@ -9,12 +9,12 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "net/base/mock_host_resolver.h"
 
 // This is a helper class to let us automatically accept extension install
@@ -25,7 +25,7 @@ class GalleryInstallApiTestObserver :
  public:
   GalleryInstallApiTestObserver() {
     registrar_.Add(this,
-                  NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
+                  chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
                   NotificationService::AllSources());
   }
 
@@ -33,7 +33,7 @@ class GalleryInstallApiTestObserver :
     delegate->InstallUIProceed();
   }
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE {
     ExtensionInstallUI* prompt = Source<ExtensionInstallUI>(source).ptr();
diff --git a/chrome/browser/extensions/extension_history_api.cc b/chrome/browser/extensions/extension_history_api.cc
index ea36ecd..cf699e00 100644
--- a/chrome/browser/extensions/extension_history_api.cc
+++ b/chrome/browser/extensions/extension_history_api.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 namespace keys = extension_history_api_constants;
 
@@ -72,23 +72,23 @@ void ExtensionHistoryEventRouter::ObserveProfile(Profile* profile) {
   NotificationSource source = Source<Profile>(profile);
   CHECK(registrar_.IsEmpty());
   registrar_.Add(this,
-                 NotificationType::HISTORY_URL_VISITED,
+                 chrome::NOTIFICATION_HISTORY_URL_VISITED,
                  source);
   registrar_.Add(this,
-                 NotificationType::HISTORY_URLS_DELETED,
+                 chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                  source);
 }
 
-void ExtensionHistoryEventRouter::Observe(NotificationType type,
+void ExtensionHistoryEventRouter::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::HISTORY_URL_VISITED:
+  switch (type) {
+    case chrome::NOTIFICATION_HISTORY_URL_VISITED:
       HistoryUrlVisited(
           Source<Profile>(source).ptr(),
           Details<const history::URLVisitedDetails>(details).ptr());
       break;
-    case NotificationType::HISTORY_URLS_DELETED:
+    case chrome::NOTIFICATION_HISTORY_URLS_DELETED:
       HistoryUrlsRemoved(
           Source<Profile>(source).ptr(),
           Details<const history::URLsDeletedDetails>(details).ptr());
diff --git a/chrome/browser/extensions/extension_history_api.h b/chrome/browser/extensions/extension_history_api.h
index bb6f55a..d547a46 100644
--- a/chrome/browser/extensions/extension_history_api.h
+++ b/chrome/browser/extensions/extension_history_api.h
@@ -24,7 +24,7 @@ class ExtensionHistoryEventRouter : public NotificationObserver {
 
  private:
   // NotificationObserver::Observe.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 88f6b93..86b7c2d 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ -146,17 +147,17 @@ ExtensionHost::ExtensionHost(const Extension* extension,
 
   // Listen for when the render process' handle is available so we can add it
   // to the task manager then.
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  Source<RenderProcessHost>(render_process_host()));
   // Listen for when an extension is unloaded from the same profile, as it may
   // be the same extension that this points to.
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(profile_));
 }
 
 ExtensionHost::~ExtensionHost() {
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_HOST_DESTROYED,
+      chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
   ProcessCreationQueue::GetInstance()->Remove(this);
@@ -258,7 +259,7 @@ void ExtensionHost::NavigateToURL(const GURL& url) {
   if (!is_background_page() &&
       !profile_->GetExtensionService()->IsBackgroundPageReady(extension_)) {
     // Make sure the background page loads before any others.
-    registrar_.Add(this, NotificationType::EXTENSION_BACKGROUND_PAGE_READY,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
                    Source<Extension>(extension_));
     return;
   }
@@ -266,22 +267,22 @@ void ExtensionHost::NavigateToURL(const GURL& url) {
   render_view_host_->NavigateToURL(url_);
 }
 
-void ExtensionHost::Observe(NotificationType type,
+void ExtensionHost::Observe(int type,
                             const NotificationSource& source,
                             const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::EXTENSION_BACKGROUND_PAGE_READY:
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY:
       DCHECK(profile_->GetExtensionService()->
           IsBackgroundPageReady(extension_));
       NavigateToURL(url_);
       break;
-    case NotificationType::RENDERER_PROCESS_CREATED:
+    case content::NOTIFICATION_RENDERER_PROCESS_CREATED:
       NotificationService::current()->Notify(
-          NotificationType::EXTENSION_PROCESS_CREATED,
+          chrome::NOTIFICATION_EXTENSION_PROCESS_CREATED,
           Source<Profile>(profile_),
           Details<ExtensionHost>(this));
       break;
-    case NotificationType::EXTENSION_UNLOADED:
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED:
       // The extension object will be deleted after this notification has been
       // sent. NULL it out so that dirty pointer issues don't arise in cases
       // when multiple ExtensionHost objects pointing to the same Extension are
@@ -332,7 +333,7 @@ void ExtensionHost::RenderViewGone(RenderViewHost* render_view_host,
   // more central, like EPM maybe.
   DCHECK_EQ(render_view_host_, render_view_host);
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_PROCESS_TERMINATED,
+      chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
 }
@@ -377,7 +378,7 @@ void ExtensionHost::DidStopLoading() {
   }
   if (notify) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+        chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
     if (extension_host_type_ == ViewType::EXTENSION_BACKGROUND_PAGE) {
@@ -420,7 +421,7 @@ void ExtensionHost::DocumentOnLoadCompletedInMainFrame(RenderViewHost* rvh,
                                                        int32 page_id) {
   if (ViewType::EXTENSION_POPUP == GetRenderViewType()) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_POPUP_VIEW_READY,
+        chrome::NOTIFICATION_EXTENSION_POPUP_VIEW_READY,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
   }
@@ -491,7 +492,7 @@ void ExtensionHost::Close(RenderViewHost* render_view_host) {
       extension_host_type_ == ViewType::EXTENSION_DIALOG ||
       extension_host_type_ == ViewType::EXTENSION_INFOBAR) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
+        chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
   }
@@ -737,7 +738,7 @@ void ExtensionHost::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
     if (event.type == NativeWebKeyboardEvent::RawKeyDown &&
         event.windowsKeyCode == ui::VKEY_ESCAPE) {
       NotificationService::current()->Notify(
-          NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
+          chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
           Source<Profile>(profile_),
           Details<ExtensionHost>(this));
       return;
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index b78895d..34dd215 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -183,7 +183,7 @@ class ExtensionHost : public RenderViewHostDelegate,
   virtual void ClearInspectorSettings();
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_infobar_delegate.cc b/chrome/browser/extensions/extension_infobar_delegate.cc
index 25d7152..b52154f 100644
--- a/chrome/browser/extensions/extension_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_infobar_delegate.cc
@@ -9,10 +9,10 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 
 ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(Browser* browser,
                                                    TabContents* tab_contents,
@@ -28,9 +28,9 @@ ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(Browser* browser,
   extension_host_.reset(manager->CreateInfobarHost(url, browser));
   extension_host_->set_associated_tab_contents(tab_contents);
 
-  registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  Source<Profile>(browser->profile()));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(browser->profile()));
 }
 
@@ -68,19 +68,19 @@ ExtensionInfoBarDelegate*
   return this;
 }
 
-void ExtensionInfoBarDelegate::Observe(NotificationType type,
+void ExtensionInfoBarDelegate::Observe(int type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
-  switch (type.value) {
-    case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
       const ExtensionHost* result = Details<ExtensionHost>(details).ptr();
       if (extension_host_.get() == result)
         wrapper->RemoveInfoBar(this);
       break;
     }
-    case NotificationType::EXTENSION_UNLOADED: {
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
           Details<UnloadedExtensionInfo>(details)->extension;
       if (extension_ == extension)
diff --git a/chrome/browser/extensions/extension_infobar_delegate.h b/chrome/browser/extensions/extension_infobar_delegate.h
index f204300..815618a 100644
--- a/chrome/browser/extensions/extension_infobar_delegate.h
+++ b/chrome/browser/extensions/extension_infobar_delegate.h
@@ -54,7 +54,7 @@ class ExtensionInfoBarDelegate : public InfoBarDelegate,
   virtual ExtensionInfoBarDelegate* AsExtensionInfoBarDelegate() OVERRIDE;
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index 19a65c2..883437e 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -137,7 +137,7 @@ bool SendKeyboardEventInputFunction::RunImpl() {
 #if defined(TOUCH_UI)
 bool HideKeyboardFunction::RunImpl() {
   NotificationService::current()->Notify(
-      NotificationType::HIDE_KEYBOARD_INVOKED,
+      chrome::HIDE_KEYBOARD_INVOKED,
       Source<HideKeyboardFunction>(this),
       NotificationService::NoDetails());
   return true;
@@ -156,7 +156,7 @@ bool SetKeyboardHeightFunction::RunImpl() {
   // and set the height of virtual keyboard directly instead of using
   // notification.
   NotificationService::current()->Notify(
-      NotificationType::SET_KEYBOARD_HEIGHT_INVOKED,
+      chrome::SET_KEYBOARD_HEIGHT_INVOKED,
       Source<SetKeyboardHeightFunction>(this),
       Details<int>(&height));
   return true;
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 6fc8368..62d904a 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -24,6 +24,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
@@ -197,7 +198,7 @@ void ExtensionInstallUI::OnImageLoaded(
       // TODO(jcivelli): http://crbug.com/44771 We should not show an install
       //                 dialog when installing an app from the gallery.
       NotificationService* service = NotificationService::current();
-      service->Notify(NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
+      service->Notify(chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           Source<ExtensionInstallUI>(this),
           NotificationService::NoDetails());
 
diff --git a/chrome/browser/extensions/extension_management_api.cc b/chrome/browser/extensions/extension_management_api.cc
index 4dd6726..61a8327 100644
--- a/chrome/browser/extensions/extension_management_api.cc
+++ b/chrome/browser/extensions/extension_management_api.cc
@@ -19,13 +19,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 using base::IntToString;
 namespace events = extension_event_names;
@@ -256,11 +256,11 @@ ExtensionManagementEventRouter::ExtensionManagementEventRouter(Profile* profile)
 ExtensionManagementEventRouter::~ExtensionManagementEventRouter() {}
 
 void ExtensionManagementEventRouter::Init() {
-  NotificationType::Type types[] = {
-    NotificationType::EXTENSION_INSTALLED,
-    NotificationType::EXTENSION_UNINSTALLED,
-    NotificationType::EXTENSION_LOADED,
-    NotificationType::EXTENSION_UNLOADED
+  int types[] = {
+    chrome::NOTIFICATION_EXTENSION_INSTALLED,
+    chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
+    chrome::NOTIFICATION_EXTENSION_LOADED,
+    chrome::NOTIFICATION_EXTENSION_UNLOADED
   };
 
   CHECK(registrar_.IsEmpty());
@@ -272,7 +272,7 @@ void ExtensionManagementEventRouter::Init() {
 }
 
 void ExtensionManagementEventRouter::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   const char* event_name = NULL;
@@ -282,17 +282,17 @@ void ExtensionManagementEventRouter::Observe(
     return;
   }
 
-  switch (type.value) {
-    case NotificationType::EXTENSION_INSTALLED:
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_INSTALLED:
       event_name = events::kOnExtensionInstalled;
       break;
-    case NotificationType::EXTENSION_UNINSTALLED:
+    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED:
       event_name = events::kOnExtensionUninstalled;
       break;
-    case NotificationType::EXTENSION_LOADED:
+    case chrome::NOTIFICATION_EXTENSION_LOADED:
       event_name = events::kOnExtensionEnabled;
       break;
-    case NotificationType::EXTENSION_UNLOADED:
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED:
       event_name = events::kOnExtensionDisabled;
       break;
     default:
diff --git a/chrome/browser/extensions/extension_management_api.h b/chrome/browser/extensions/extension_management_api.h
index 92099a3..1096fc1 100644
--- a/chrome/browser/extensions/extension_management_api.h
+++ b/chrome/browser/extensions/extension_management_api.h
@@ -56,7 +56,7 @@ class ExtensionManagementEventRouter : public NotificationObserver {
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_management_apitest.cc b/chrome/browser/extensions/extension_management_apitest.cc
index d18972f..f62383f2 100644
--- a/chrome/browser/extensions/extension_management_apitest.cc
+++ b/chrome/browser/extensions/extension_management_apitest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/ui_test_utils.h"
 
 namespace {
@@ -97,7 +98,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
 
   // Close the app panel.
   ui_test_utils::WindowedNotificationObserver signal(
-      NotificationType::BROWSER_CLOSED,
+      chrome::NOTIFICATION_BROWSER_CLOSED,
       Source<Browser>(app_browser));
 
   app_browser->CloseWindow();
diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc
index 53a7e21..95c3670 100644
--- a/chrome/browser/extensions/extension_management_browsertest.cc
+++ b/chrome/browser/extensions/extension_management_browsertest.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
@@ -234,10 +235,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) {
 class NotificationListener : public NotificationObserver {
  public:
   NotificationListener() : started_(false), finished_(false) {
-    NotificationType::Type types[] = {
-      NotificationType::EXTENSION_UPDATING_STARTED,
-      NotificationType::EXTENSION_UPDATING_FINISHED,
-      NotificationType::EXTENSION_UPDATE_FOUND
+    int types[] = {
+      chrome::NOTIFICATION_EXTENSION_UPDATING_STARTED,
+      chrome::NOTIFICATION_EXTENSION_UPDATING_FINISHED,
+      chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND
     };
     for (size_t i = 0; i < arraysize(types); i++) {
       registrar_.Add(this, types[i], NotificationService::AllSources());
@@ -258,21 +259,21 @@ class NotificationListener : public NotificationObserver {
   }
 
   // Implements NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    switch (type.value) {
-      case NotificationType::EXTENSION_UPDATING_STARTED: {
+    switch (type) {
+      case chrome::NOTIFICATION_EXTENSION_UPDATING_STARTED: {
         DCHECK(!started_);
         started_ = true;
         break;
       }
-      case NotificationType::EXTENSION_UPDATING_FINISHED: {
+      case chrome::NOTIFICATION_EXTENSION_UPDATING_FINISHED: {
         DCHECK(!finished_);
         finished_ = true;
         break;
       }
-      case NotificationType::EXTENSION_UPDATE_FOUND: {
+      case chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND: {
         const std::string* id = Details<const std::string>(details).ptr();
         updates_.insert(*id);
         break;
diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc
index 33ed7fc..6e87364 100644
--- a/chrome/browser/extensions/extension_menu_manager.cc
+++ b/chrome/browser/extensions/extension_menu_manager.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_service.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -95,7 +96,7 @@ const int ExtensionMenuManager::kAllowedSchemes =
     URLPattern::SCHEME_HTTP | URLPattern::SCHEME_HTTPS;
 
 ExtensionMenuManager::ExtensionMenuManager() {
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  NotificationService::AllSources());
 }
 
@@ -448,11 +449,11 @@ void ExtensionMenuManager::ExecuteCommand(
       item->extension_id(), event_name, json_args, profile, GURL());
 }
 
-void ExtensionMenuManager::Observe(NotificationType type,
+void ExtensionMenuManager::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   // Remove menu items for disabled/uninstalled extensions.
-  if (type != NotificationType::EXTENSION_UNLOADED) {
+  if (type != chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     NOTREACHED();
     return;
   }
diff --git a/chrome/browser/extensions/extension_menu_manager.h b/chrome/browser/extensions/extension_menu_manager.h
index eb87ae7..01471c7 100644
--- a/chrome/browser/extensions/extension_menu_manager.h
+++ b/chrome/browser/extensions/extension_menu_manager.h
@@ -250,7 +250,7 @@ class ExtensionMenuManager : public NotificationObserver {
   const SkBitmap& GetIconForExtension(const std::string& extension_id);
 
   // Implements the NotificationObserver interface.
-  virtual void Observe(NotificationType type, const NotificationSource& source,
+  virtual void Observe(int type, const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Returns true if |url| has an allowed scheme for extension context menu
diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc
index fff6f91..71847dc 100644
--- a/chrome/browser/extensions/extension_menu_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -330,7 +331,7 @@ TEST_F(ExtensionMenuManagerTest, ExtensionUnloadRemovesMenuItems) {
   // Notify that the extension was unloaded, and make sure the right item is
   // gone.
   UnloadedExtensionInfo details(extension1, UnloadedExtensionInfo::DISABLE);
-  notifier->Notify(NotificationType::EXTENSION_UNLOADED,
+  notifier->Notify(chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    Source<Profile>(NULL),
                    Details<UnloadedExtensionInfo>(&details));
   ASSERT_EQ(NULL, manager_.MenuItems(extension1->id()));
diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index c905436..73e37b8 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -116,11 +116,11 @@ void ExtensionMessageService::AllocatePortIdPair(int* port1, int* port2) {
 
 ExtensionMessageService::ExtensionMessageService(Profile* profile)
     : profile_(profile) {
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
                  NotificationService::AllSources());
 }
 
@@ -324,17 +324,17 @@ void ExtensionMessageService::PostMessageFromRenderer(
 
   DispatchOnMessage(port, message, dest_port_id);
 }
-void ExtensionMessageService::Observe(NotificationType type,
+void ExtensionMessageService::Observe(int type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::RENDERER_PROCESS_TERMINATED:
-    case NotificationType::RENDERER_PROCESS_CLOSED: {
+  switch (type) {
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       RenderProcessHost* renderer = Source<RenderProcessHost>(source).ptr();
       OnSenderClosed(renderer);
       break;
     }
-    case NotificationType::RENDER_VIEW_HOST_DELETED:
+    case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED:
       OnSenderClosed(Source<RenderViewHost>(source).ptr());
       break;
     default:
diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h
index 5f01a9c..91e8239 100644
--- a/chrome/browser/extensions/extension_message_service.h
+++ b/chrome/browser/extensions/extension_message_service.h
@@ -134,7 +134,7 @@ class ExtensionMessageService
                         bool notify_other_port);
 
   // NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 8d26ace..215f5b9 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
@@ -14,12 +15,12 @@ namespace {
 class MessageSender : public NotificationObserver {
  public:
   MessageSender() {
-    registrar_.Add(this, NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                    NotificationService::AllSources());
   }
 
  private:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     ExtensionEventRouter* event_router =
diff --git a/chrome/browser/extensions/extension_metrics_apitest.cc b/chrome/browser/extensions/extension_metrics_apitest.cc
index 522ea40..74bd826 100644
--- a/chrome/browser/extensions/extension_metrics_apitest.cc
+++ b/chrome/browser/extensions/extension_metrics_apitest.cc
@@ -64,7 +64,7 @@ class UserActionObserver : public NotificationObserver {
                            const RecordedUserAction* recorded,
                            int count);
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ -85,11 +85,11 @@ class UserActionObserver : public NotificationObserver {
 };
 
 UserActionObserver::UserActionObserver() {
-  registrar_.Add(this, NotificationType::USER_ACTION,
+  registrar_.Add(this, content::NOTIFICATION_USER_ACTION,
                  NotificationService::AllSources());
 }
 
-void UserActionObserver::Observe(NotificationType type,
+void UserActionObserver::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   const char* name = *Details<const char*>(details).ptr();
diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc
index d5bd8b5..21a7227 100644
--- a/chrome/browser/extensions/extension_omnibox_api.cc
+++ b/chrome/browser/extensions/extension_omnibox_api.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/common/notification_service.h"
 
@@ -99,7 +100,7 @@ void ExtensionOmniboxEventRouter::OnInputEntered(
       extension_id, events::kOnInputEntered, json_args, profile, GURL());
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_OMNIBOX_INPUT_ENTERED,
+      chrome::NOTIFICATION_EXTENSION_OMNIBOX_INPUT_ENTERED,
       Source<Profile>(profile), NotificationService::NoDetails());
 }
 
@@ -140,7 +141,7 @@ bool OmniboxSendSuggestionsFunction::RunImpl() {
   }
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_OMNIBOX_SUGGESTIONS_READY,
+      chrome::NOTIFICATION_EXTENSION_OMNIBOX_SUGGESTIONS_READY,
       Source<Profile>(profile_),
       Details<ExtensionOmniboxSuggestions>(&suggestions));
 
@@ -171,7 +172,7 @@ bool OmniboxSetDefaultSuggestionFunction::RunImpl() {
       suggestion);
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
+      chrome::NOTIFICATION_EXTENSION_OMNIBOX_DEFAULT_SUGGESTION_CHANGED,
       Source<Profile>(profile_),
       NotificationService::NoDetails());
 
diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc
index ba762ca..554c7e5 100644
--- a/chrome/browser/extensions/extension_omnibox_apitest.cc
+++ b/chrome/browser/extensions/extension_omnibox_apitest.cc
@@ -19,9 +19,10 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
-#include "content/common/notification_type.h"
+#include "content/common/content_notification_types.h"
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
@@ -68,14 +69,14 @@ class OmniboxApiTest : public ExtensionApiTest {
     model->Load();
     if (!model->loaded()) {
       ui_test_utils::WaitForNotification(
-          NotificationType::TEMPLATE_URL_SERVICE_LOADED);
+          chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
     }
   }
 
   void WaitForAutocompleteDone(AutocompleteController* controller) {
     while (!controller->done()) {
       ui_test_utils::WaitForNotification(
-          NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_READY);
+          chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY);
     }
   }
 };
diff --git a/chrome/browser/extensions/extension_preference_api.cc b/chrome/browser/extensions/extension_preference_api.cc
index 21b1f71..da463ddb 100644
--- a/chrome/browser/extensions/extension_preference_api.cc
+++ b/chrome/browser/extensions/extension_preference_api.cc
@@ -19,10 +19,10 @@
 #include "chrome/browser/extensions/extension_proxy_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_permission_set.h"
 #include "chrome/common/pref_names.h"
-#include "content/common/notification_type.h"
 #include "content/common/notification_service.h"
 
 namespace {
@@ -233,10 +233,10 @@ ExtensionPreferenceEventRouter::ExtensionPreferenceEventRouter(
 ExtensionPreferenceEventRouter::~ExtensionPreferenceEventRouter() { }
 
 void ExtensionPreferenceEventRouter::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  if (type == NotificationType::PREF_CHANGED) {
+  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     const std::string* pref_key =
         Details<const std::string>(details).ptr();
     OnPrefChanged(Source<PrefService>(source).ptr(), *pref_key);
diff --git a/chrome/browser/extensions/extension_preference_api.h b/chrome/browser/extensions/extension_preference_api.h
index 1dab6b9..804d062 100644
--- a/chrome/browser/extensions/extension_preference_api.h
+++ b/chrome/browser/extensions/extension_preference_api.h
@@ -19,7 +19,7 @@ class ExtensionPreferenceEventRouter : public NotificationObserver {
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 600dea7..5b4b36b 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/url_pattern.h"
@@ -1042,7 +1043,7 @@ void ExtensionPrefs::SetBrowserActionVisibility(const Extension* extension,
   UpdateExtensionPref(extension->id(), kBrowserActionVisible,
                       Value::CreateBooleanValue(visible));
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
+      chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
       Source<ExtensionPrefs>(this),
       Details<const Extension>(extension));
 }
@@ -1354,7 +1355,7 @@ void ExtensionPrefs::SetAppLauncherOrder(
     SetAppLaunchIndex(extension_ids.at(i), i);
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_LAUNCHER_REORDERED,
+      chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
       Source<ExtensionPrefs>(this),
       NotificationService::NoDetails());
 }
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 4be0f74..dea004a 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -13,12 +13,12 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 namespace {
 
@@ -40,7 +40,7 @@ class IncognitoExtensionProcessManager : public ExtensionProcessManager {
 
  private:
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ -87,19 +87,19 @@ ExtensionProcessManager* ExtensionProcessManager::Create(Profile* profile) {
 ExtensionProcessManager::ExtensionProcessManager(Profile* profile)
     : browsing_instance_(new BrowsingInstance(profile)) {
   Profile* original_profile = profile->GetOriginalProfile();
-  registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  Source<Profile>(original_profile));
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  Source<Profile>(original_profile));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(original_profile));
-  registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
                  Source<Profile>(profile));
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::APP_TERMINATING,
+  registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                  NotificationService::AllSources());
 }
 
@@ -269,17 +269,17 @@ bool ExtensionProcessManager::HasExtensionHost(ExtensionHost* host) const {
   return all_hosts_.find(host) != all_hosts_.end();
 }
 
-void ExtensionProcessManager::Observe(NotificationType type,
+void ExtensionProcessManager::Observe(int type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::EXTENSIONS_READY: {
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSIONS_READY: {
       CreateBackgroundHosts(this,
           Source<Profile>(source).ptr()->GetExtensionService()->extensions());
       break;
     }
 
-    case NotificationType::EXTENSION_LOADED: {
+    case chrome::NOTIFICATION_EXTENSION_LOADED: {
       ExtensionService* service =
           Source<Profile>(source).ptr()->GetExtensionService();
       if (service->is_ready()) {
@@ -289,7 +289,7 @@ void ExtensionProcessManager::Observe(NotificationType type,
       break;
     }
 
-    case NotificationType::EXTENSION_UNLOADED: {
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
           Details<UnloadedExtensionInfo>(details)->extension;
       for (ExtensionHostSet::iterator iter = background_hosts_.begin();
@@ -305,21 +305,21 @@ void ExtensionProcessManager::Observe(NotificationType type,
       break;
     }
 
-    case NotificationType::EXTENSION_HOST_DESTROYED: {
+    case chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
       ExtensionHost* host = Details<ExtensionHost>(details).ptr();
       all_hosts_.erase(host);
       background_hosts_.erase(host);
       break;
     }
 
-    case NotificationType::RENDERER_PROCESS_TERMINATED:
-    case NotificationType::RENDERER_PROCESS_CLOSED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
+    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       RenderProcessHost* host = Source<RenderProcessHost>(source).ptr();
       UnregisterExtensionProcess(host->id());
       break;
     }
 
-    case NotificationType::APP_TERMINATING: {
+    case content::NOTIFICATION_APP_TERMINATING: {
       // Close background hosts when the last browser is closed so that they
       // have time to shutdown various objects on different threads. Our
       // destructor is called too late in the shutdown sequence.
@@ -340,7 +340,7 @@ void ExtensionProcessManager::OnExtensionHostCreated(ExtensionHost* host,
   if (is_background)
     background_hosts_.insert(host);
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_HOST_CREATED,
+      chrome::NOTIFICATION_EXTENSION_HOST_CREATED,
       Source<ExtensionProcessManager>(this),
       Details<ExtensionHost>(host));
 }
@@ -365,7 +365,7 @@ IncognitoExtensionProcessManager::IncognitoExtensionProcessManager(
                             GetExtensionProcessManager()) {
   DCHECK(profile->IsOffTheRecord());
 
-  registrar_.Add(this, NotificationType::BROWSER_WINDOW_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                  NotificationService::AllSources());
 }
 
@@ -439,11 +439,11 @@ bool IncognitoExtensionProcessManager::IsIncognitoEnabled(
 }
 
 void IncognitoExtensionProcessManager::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::BROWSER_WINDOW_READY: {
+  switch (type) {
+    case chrome::NOTIFICATION_BROWSER_WINDOW_READY: {
       // We want to spawn our background hosts as soon as the user opens an
       // incognito window. Watch for new browsers and create the hosts if
       // it matches our profile.
diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h
index 8bf5e77..c2a7710 100644
--- a/chrome/browser/extensions/extension_process_manager.h
+++ b/chrome/browser/extensions/extension_process_manager.h
@@ -100,7 +100,7 @@ class ExtensionProcessManager : public NotificationObserver {
   void CloseBackgroundHosts();
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc
index 266afdc..0daa174 100644
--- a/chrome/browser/extensions/extension_processes_api.cc
+++ b/chrome/browser/extensions/extension_processes_api.cc
@@ -22,7 +22,7 @@
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_type.h"
+#include "content/common/content_notification_types.h"
 
 namespace keys = extension_processes_api_constants;
 
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index c2c32d7..94e237f 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -58,6 +58,7 @@
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ -74,9 +75,9 @@
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domain.h"
@@ -352,7 +353,7 @@ void ExtensionServiceBackend::ReportExtensionLoadError(
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (frontend_.get())
     frontend_->ReportExtensionLoadError(
-        extension_path, error, NotificationType::EXTENSION_INSTALL_ERROR,
+        extension_path, error, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
         true /* alert_on_error */);
 }
 
@@ -561,11 +562,11 @@ ExtensionService::ExtensionService(Profile* profile,
     extensions_enabled_ = false;
   }
 
-  registrar_.Add(this, NotificationType::EXTENSION_PROCESS_TERMINATED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(prefs::kExtensionInstallAllowList, this);
@@ -834,7 +835,7 @@ bool ExtensionService::UninstallExtension(
   // managed extensions.
   if (!Extension::UserMayDisable(location) && !external_uninstall) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_UNINSTALL_NOT_ALLOWED,
+        chrome::NOTIFICATION_EXTENSION_UNINSTALL_NOT_ALLOWED,
         Source<Profile>(profile_),
         Details<const Extension>(extension));
     if (error != NULL) {
@@ -878,7 +879,7 @@ bool ExtensionService::UninstallExtension(
 
   // Notify interested parties that we've uninstalled this extension.
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_UNINSTALLED,
+      chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       Source<Profile>(profile_),
       Details<UninstalledExtensionInfo>(&uninstalled_extension_info));
 
@@ -1253,7 +1254,7 @@ void ExtensionService::LoadInstalledExtension(const ExtensionInfo& info,
   if (!extension) {
     ReportExtensionLoadError(info.extension_path,
                              error,
-                             NotificationType::EXTENSION_INSTALL_ERROR,
+                             chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
                              false);
     return;
   }
@@ -1276,7 +1277,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
   // Tell subsystems that use the EXTENSION_LOADED notification about the new
   // extension.
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_LOADED,
+      chrome::NOTIFICATION_EXTENSION_LOADED,
       Source<Profile>(profile_),
       Details<const Extension>(extension));
 
@@ -1373,7 +1374,7 @@ void ExtensionService::NotifyExtensionUnloaded(
     const Extension* extension, UnloadedExtensionInfo::Reason reason) {
   UnloadedExtensionInfo details(extension, reason);
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_UNLOADED,
+      chrome::NOTIFICATION_EXTENSION_UNLOADED,
       Source<Profile>(profile_),
       Details<UnloadedExtensionInfo>(&details));
 
@@ -1791,7 +1792,7 @@ void ExtensionService::UnloadExtension(
     details.already_disabled = true;
     disabled_extensions_.erase(iter);
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_UNLOADED,
+        chrome::NOTIFICATION_EXTENSION_UNLOADED,
         Source<Profile>(profile_),
         Details<UnloadedExtensionInfo>(&details));
     // Make sure the profile cleans up its RequestContexts when an already
@@ -1863,7 +1864,7 @@ void ExtensionService::OnLoadedInstalledExtensions() {
 
   ready_ = true;
   NotificationService::current()->Notify(
-      NotificationType::EXTENSIONS_READY,
+      chrome::NOTIFICATION_EXTENSIONS_READY,
       Source<Profile>(profile_),
       NotificationService::NoDetails());
 }
@@ -1904,7 +1905,7 @@ void ExtensionService::AddExtension(const Extension* extension) {
     // with a disabled extension for other reasons other than that an update was
     // disabled.
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_UPDATE_DISABLED,
+        chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
         Source<Profile>(profile_),
         Details<const Extension>(extension));
     return;
@@ -2038,7 +2039,7 @@ void ExtensionService::OnExtensionInstalled(const Extension* extension) {
           << "; not installing";
 
       NotificationService::current()->Notify(
-          NotificationType::EXTENSION_INSTALL_NOT_ALLOWED,
+          chrome::NOTIFICATION_EXTENSION_INSTALL_NOT_ALLOWED,
           Source<Profile>(profile_),
           Details<const Extension>(extension));
 
@@ -2080,7 +2081,7 @@ void ExtensionService::OnExtensionInstalled(const Extension* extension) {
   }
 
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_INSTALLED,
+      chrome::NOTIFICATION_EXTENSION_INSTALLED,
       Source<Profile>(profile_),
       Details<const Extension>(extension));
 
@@ -2239,7 +2240,7 @@ void ExtensionService::OnExternalExtensionFileFound(
 void ExtensionService::ReportExtensionLoadError(
     const FilePath& extension_path,
     const std::string &error,
-    NotificationType type,
+    int type,
     bool be_noisy) {
   NotificationService* service = NotificationService::current();
   service->Notify(type,
@@ -2265,11 +2266,11 @@ void ExtensionService::DidCreateRenderViewForBackgroundPage(
   orphaned_dev_tools_.erase(iter);
 }
 
-void ExtensionService::Observe(NotificationType type,
+void ExtensionService::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::EXTENSION_PROCESS_TERMINATED: {
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED: {
       if (profile_ != Source<Profile>(source).ptr()->GetOriginalProfile())
         break;
 
@@ -2287,7 +2288,7 @@ void ExtensionService::Observe(NotificationType type,
               host->extension()));
       break;
     }
-    case NotificationType::RENDERER_PROCESS_CREATED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_CREATED: {
       RenderProcessHost* process = Source<RenderProcessHost>(source).ptr();
       // Valid extension function names, used to setup bindings in renderer.
       std::vector<std::string> function_names;
@@ -2306,12 +2307,12 @@ void ExtensionService::Observe(NotificationType type,
       }
       break;
     }
-    case NotificationType::RENDERER_PROCESS_TERMINATED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED: {
       RenderProcessHost* process = Source<RenderProcessHost>(source).ptr();
       installed_app_hosts_.erase(process->id());
       break;
     }
-    case NotificationType::PREF_CHANGED: {
+    case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* pref_name = Details<std::string>(details).ptr();
       if (*pref_name == prefs::kExtensionInstallAllowList ||
           *pref_name == prefs::kExtensionInstallDenyList) {
@@ -2356,7 +2357,7 @@ void ExtensionService::SetBackgroundPageReady(const Extension* extension) {
   DCHECK(!extension->background_url().is_empty());
   extension_runtime_data_[extension->id()].background_page_ready = true;
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_BACKGROUND_PAGE_READY,
+      chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
       Source<const Extension>(extension),
       NotificationService::NoDetails());
 }
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 401eef4..d8c84c9 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -470,7 +470,7 @@ class ExtensionService
   // This method is public because ExtensionServiceBackend can post to here.
   void ReportExtensionLoadError(const FilePath& extension_path,
                                 const std::string& error,
-                                NotificationType type,
+                                int type,
                                 bool be_noisy);
 
   // ExtensionHost of background page calls this method right after its render
@@ -501,7 +501,7 @@ class ExtensionService
   virtual void OnExternalProviderReady();
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ -660,7 +660,7 @@ class ExtensionService
   // Used by dispatchers to limit API quota for individual extensions.
   ExtensionsQuotaService quota_service_;
 
-  // Record that Init() has been called, and NotificationType::EXTENSIONS_READY
+  // Record that Init() has been called, and chrome::EXTENSIONS_READY
   // has fired.
   bool ready_;
 
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 8008828..210ab66 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -39,6 +39,7 @@
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
@@ -56,7 +57,6 @@
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_options.h"
@@ -492,19 +492,19 @@ class ExtensionServiceTest
   : public ExtensionServiceTestBase, public NotificationObserver {
  public:
   ExtensionServiceTest() : installed_(NULL) {
-    registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                    NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::EXTENSION_INSTALLED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
                    NotificationService::AllSources());
   }
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    switch (type.value) {
-      case NotificationType::EXTENSION_LOADED: {
+    switch (type) {
+      case chrome::NOTIFICATION_EXTENSION_LOADED: {
         const Extension* extension = Details<const Extension>(details).ptr();
         loaded_.push_back(make_scoped_refptr(extension));
         // The tests rely on the errors being in a certain order, which can vary
@@ -513,7 +513,7 @@ class ExtensionServiceTest
         break;
       }
 
-      case NotificationType::EXTENSION_UNLOADED: {
+      case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
         const Extension* e =
             Details<UnloadedExtensionInfo>(details)->extension;
         unloaded_id_ = e->id();
@@ -526,7 +526,7 @@ class ExtensionServiceTest
         loaded_.erase(i);
         break;
       }
-      case NotificationType::EXTENSION_INSTALLED:
+      case chrome::NOTIFICATION_EXTENSION_INSTALLED:
         installed_ = Details<const Extension>(details).ptr();
         break;
 
@@ -3194,7 +3194,7 @@ TEST_F(ExtensionServiceTest, LoadAndRelocalizeExtensions) {
 class ExtensionsReadyRecorder : public NotificationObserver {
  public:
   ExtensionsReadyRecorder() : ready_(false) {
-    registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                    NotificationService::AllSources());
   }
 
@@ -3202,11 +3202,11 @@ class ExtensionsReadyRecorder : public NotificationObserver {
   bool ready() { return ready_; }
 
  private:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    switch (type.value) {
-      case NotificationType::EXTENSIONS_READY:
+    switch (type) {
+      case chrome::NOTIFICATION_EXTENSIONS_READY:
         ready_ = true;
         break;
       default:
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index dc046a1..554c210 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -12,13 +12,13 @@
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
-#include "content/common/notification_type.h"
 #include "net/base/net_util.h"
 
 // This file contains high-level startup tests for the extensions system. We've
@@ -93,7 +93,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
     UserScriptMaster* master = browser()->profile()->GetUserScriptMaster();
     if (!master->ScriptsReady()) {
       ui_test_utils::WaitForNotification(
-          NotificationType::USER_SCRIPTS_UPDATED);
+          chrome::NOTIFICATION_USER_SCRIPTS_UPDATED);
     }
     ASSERT_TRUE(master->ScriptsReady());
   }
@@ -168,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
     if (service->AllowFileAccess(service->extensions()->at(i))) {
       service->SetAllowFileAccess(service->extensions()->at(i), false);
       ui_test_utils::WaitForNotification(
-           NotificationType::USER_SCRIPTS_UPDATED);
+           chrome::NOTIFICATION_USER_SCRIPTS_UPDATED);
     }
   }
 
diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc
index 0b9ead9..5495e6e 100644
--- a/chrome/browser/extensions/extension_tab_helper.cc
+++ b/chrome/browser/extensions/extension_tab_helper.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ -52,7 +53,7 @@ void ExtensionTabHelper::SetExtensionApp(const Extension* extension) {
   UpdateExtensionAppIcon(extension_app_);
 
   NotificationService::current()->Notify(
-      NotificationType::TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
+      chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED,
       Source<ExtensionTabHelper>(this),
       NotificationService::NoDetails());
 }
@@ -97,7 +98,7 @@ void ExtensionTabHelper::DidNavigateMainFramePostCommit(
       browser_action->ClearAllValuesForTab(
           wrapper_->restore_tab_helper()->session_id().id());
       NotificationService::current()->Notify(
-          NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
+          chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
           Source<ExtensionAction>(browser_action),
           NotificationService::NoDetails());
     }
diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc
index ec319c0..202bd28 100644
--- a/chrome/browser/extensions/extension_tab_id_map.cc
+++ b/chrome/browser/extensions/extension_tab_id_map.cc
@@ -31,7 +31,7 @@ class ExtensionTabIdMap::TabObserver : public NotificationObserver {
 
  private:
   // NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
@@ -40,11 +40,11 @@ class ExtensionTabIdMap::TabObserver : public NotificationObserver {
 
 ExtensionTabIdMap::TabObserver::TabObserver() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED,
+  registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::TAB_PARENTED,
+  registrar_.Add(this, content::NOTIFICATION_TAB_PARENTED,
                  NotificationService::AllSources());
 }
 
@@ -53,10 +53,10 @@ ExtensionTabIdMap::TabObserver::~TabObserver() {
 }
 
 void ExtensionTabIdMap::TabObserver::Observe(
-    NotificationType type, const NotificationSource& source,
+    int type, const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::RENDER_VIEW_HOST_CREATED_FOR_TAB: {
+  switch (type) {
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
       TabContents* contents = Source<TabContents>(source).ptr();
       TabContentsWrapper* tab =
           TabContentsWrapper::GetCurrentWrapperForContents(contents);
@@ -75,7 +75,7 @@ void ExtensionTabIdMap::TabObserver::Observe(
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
-    case NotificationType::TAB_PARENTED: {
+    case content::NOTIFICATION_TAB_PARENTED: {
       TabContentsWrapper* tab = Source<TabContentsWrapper>(source).ptr();
       RenderViewHost* host = tab->render_view_host();
       BrowserThread::PostTask(
@@ -88,7 +88,7 @@ void ExtensionTabIdMap::TabObserver::Observe(
               tab->restore_tab_helper()->window_id().id()));
       break;
     }
-    case NotificationType::RENDER_VIEW_HOST_DELETED: {
+    case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED: {
       RenderViewHost* host = Source<RenderViewHost>(source).ptr();
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index dbe4b30..bd4008e 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/window_sizer.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
@@ -1205,7 +1206,7 @@ bool CaptureVisibleTabFunction::RunImpl() {
   TabContentsWrapper* wrapper = browser->GetSelectedTabContentsWrapper();
   wrapper->CaptureSnapshot();
   registrar_.Add(this,
-                 NotificationType::TAB_SNAPSHOT_TAKEN,
+                 chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN,
                  Source<TabContentsWrapper>(wrapper));
   AddRef();  // Balanced in CaptureVisibleTabFunction::Observe().
 
@@ -1234,10 +1235,10 @@ bool CaptureVisibleTabFunction::CaptureSnapshotFromBackingStore(
 // If a backing store was not available in CaptureVisibleTabFunction::RunImpl,
 // than the renderer was asked for a snapshot.  Listen for a notification
 // that the snapshot is available.
-void CaptureVisibleTabFunction::Observe(NotificationType type,
+void CaptureVisibleTabFunction::Observe(int type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
-  DCHECK(type == NotificationType::TAB_SNAPSHOT_TAKEN);
+  DCHECK(type == chrome::NOTIFICATION_TAB_SNAPSHOT_TAKEN);
 
   const SkBitmap *screen_capture = Details<const SkBitmap>(details).ptr();
   const bool error = screen_capture->empty();
@@ -1347,20 +1348,20 @@ bool DetectTabLanguageFunction::RunImpl() {
   }
   // The tab contents does not know its language yet.  Let's  wait until it
   // receives it, or until the tab is closed/navigates to some other page.
-  registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED,
+  registrar_.Add(this, chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
                  Source<TabContents>(contents->tab_contents()));
-  registrar_.Add(this, NotificationType::TAB_CLOSING,
+  registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
                  Source<NavigationController>(&(contents->controller())));
-  registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  Source<NavigationController>(&(contents->controller())));
   return true;
 }
 
-void DetectTabLanguageFunction::Observe(NotificationType type,
+void DetectTabLanguageFunction::Observe(int type,
                                         const NotificationSource& source,
                                         const NotificationDetails& details) {
   std::string language;
-  if (type == NotificationType::TAB_LANGUAGE_DETERMINED)
+  if (type == chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED)
     language = *Details<std::string>(details).ptr();
 
   registrar_.RemoveAll();
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index b2d7034..f02f9ed 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -145,7 +145,7 @@ class DetectTabLanguageFunction : public AsyncExtensionFunction,
   virtual ~DetectTabLanguageFunction() {}
   virtual bool RunImpl();
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
   void GotLanguage(const std::string& language);
@@ -166,7 +166,7 @@ class CaptureVisibleTabFunction : public AsyncExtensionFunction,
   virtual ~CaptureVisibleTabFunction() {}
   virtual bool RunImpl();
   virtual bool CaptureSnapshotFromBackingStore(BackingStore* backing_store);
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
   virtual void SendResultFromBitmap(const SkBitmap& screen_capture);
diff --git a/chrome/browser/extensions/extension_test_api.cc b/chrome/browser/extensions/extension_test_api.cc
index e5bc60f..693d111 100644
--- a/chrome/browser/extensions/extension_test_api.cc
+++ b/chrome/browser/extensions/extension_test_api.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 
 namespace {
@@ -28,7 +29,7 @@ ExtensionTestPassFunction::~ExtensionTestPassFunction() {}
 
 bool ExtensionTestPassFunction::RunImpl() {
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_TEST_PASSED,
+      chrome::NOTIFICATION_EXTENSION_TEST_PASSED,
       Source<Profile>(dispatcher()->profile()),
       NotificationService::NoDetails());
   return true;
@@ -40,7 +41,7 @@ bool ExtensionTestFailFunction::RunImpl() {
   std::string message;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &message));
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_TEST_FAILED,
+      chrome::NOTIFICATION_EXTENSION_TEST_FAILED,
       Source<Profile>(dispatcher()->profile()),
       Details<std::string>(&message));
   return true;
@@ -80,7 +81,7 @@ bool ExtensionTestSendMessageFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &message));
   AddRef();  // balanced in Reply
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_TEST_MESSAGE,
+      chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
       Source<ExtensionTestSendMessageFunction>(this),
       Details<std::string>(&message));
   return true;
diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc
index 444b700..8067be5 100644
--- a/chrome/browser/extensions/extension_test_message_listener.cc
+++ b/chrome/browser/extensions/extension_test_message_listener.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 
 #include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 
 ExtensionTestMessageListener::ExtensionTestMessageListener(
     const std::string& expected_message,
@@ -16,7 +16,7 @@ ExtensionTestMessageListener::ExtensionTestMessageListener(
       satisfied_(false),
       waiting_(false),
       will_reply_(will_reply) {
-  registrar_.Add(this, NotificationType::EXTENSION_TEST_MESSAGE,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
                  NotificationService::AllSources());
 }
 
@@ -39,7 +39,7 @@ void ExtensionTestMessageListener::Reply(const std::string& message) {
 }
 
 void ExtensionTestMessageListener::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   const std::string& content = *Details<std::string>(details).ptr();
diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h
index fa06dc7..66be515 100644
--- a/chrome/browser/extensions/extension_test_message_listener.h
+++ b/chrome/browser/extensions/extension_test_message_listener.h
@@ -59,7 +59,7 @@ class ExtensionTestMessageListener : public NotificationObserver {
   void Reply(const std::string& message);
 
   // Implements the NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index 659f7a4..d71f620 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_service.h"
@@ -18,15 +19,15 @@ ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service)
       extensions_initialized_(false) {
   DCHECK(service_);
 
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  Source<Profile>(service_->profile()));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(service_->profile()));
-  registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  Source<Profile>(service_->profile()));
-  registrar_.Add(this,
-                 NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
-                 NotificationService::AllSources());
+  registrar_.Add(
+      this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
+      NotificationService::AllSources());
 
   visible_icon_count_ = prefs_->GetInteger(prefs::kExtensionToolbarSize);
 }
@@ -79,10 +80,10 @@ void ExtensionToolbarModel::SetVisibleIconCount(int count) {
   prefs_->ScheduleSavePersistentPrefs();
 }
 
-void ExtensionToolbarModel::Observe(NotificationType type,
+void ExtensionToolbarModel::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
-  if (type == NotificationType::EXTENSIONS_READY) {
+  if (type == chrome::NOTIFICATION_EXTENSIONS_READY) {
     InitializeExtensionList();
     return;
   }
@@ -91,12 +92,12 @@ void ExtensionToolbarModel::Observe(NotificationType type,
     return;
 
   const Extension* extension = NULL;
-  if (type == NotificationType::EXTENSION_UNLOADED) {
+  if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     extension = Details<UnloadedExtensionInfo>(details)->extension;
   } else {
     extension = Details<const Extension>(details).ptr();
   }
-  if (type == NotificationType::EXTENSION_LOADED) {
+  if (type == chrome::NOTIFICATION_EXTENSION_LOADED) {
     // We don't want to add the same extension twice. It may have already been
     // added by EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED below, if the user
     // hides the browser action and then disables and enables the extension.
@@ -106,10 +107,11 @@ void ExtensionToolbarModel::Observe(NotificationType type,
     }
     if (service_->GetBrowserActionVisibility(extension))
       AddExtension(extension);
-  } else if (type == NotificationType::EXTENSION_UNLOADED) {
+  } else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) {
     RemoveExtension(extension);
-  } else if (type ==
-             NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {
+  } else if (
+        type ==
+        chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED) {
     if (service_->GetBrowserActionVisibility(extension))
       AddExtension(extension);
     else
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index 3b1642d..e60d7e0 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -74,7 +74,7 @@ class ExtensionToolbarModel : public NotificationObserver {
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index aa4c14c9..797b371 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/chrome_version_info.h"
@@ -894,7 +895,7 @@ bool ExtensionUpdater::MaybeInstallCRXFile() {
       // Source parameter ensures that we only see the completion event for the
       // the installer we started.
       registrar_.Add(this,
-                     NotificationType::CRX_INSTALLER_DONE,
+                     chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                      Source<CrxInstaller>(installer));
     }
     in_progress_ids_.erase(crx_file.id);
@@ -905,14 +906,14 @@ bool ExtensionUpdater::MaybeInstallCRXFile() {
   return crx_install_is_running_;
 }
 
-void ExtensionUpdater::Observe(NotificationType type,
+void ExtensionUpdater::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  DCHECK(type == NotificationType::CRX_INSTALLER_DONE);
+  DCHECK(type == chrome::NOTIFICATION_CRX_INSTALLER_DONE);
 
   // No need to listen for CRX_INSTALLER_DONE anymore.
   registrar_.Remove(this,
-                    NotificationType::CRX_INSTALLER_DONE,
+                    chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                     source);
   crx_install_is_running_ = false;
   // If any files are available to update, start one.
@@ -1207,14 +1208,14 @@ void ExtensionUpdater::FetchUpdatedExtension(const std::string& id,
 
 void ExtensionUpdater::NotifyStarted() {
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_UPDATING_STARTED,
+      chrome::NOTIFICATION_EXTENSION_UPDATING_STARTED,
       Source<Profile>(profile_),
       NotificationService::NoDetails());
 }
 
 void ExtensionUpdater::NotifyUpdateFound(const std::string& extension_id) {
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_UPDATE_FOUND,
+      chrome::NOTIFICATION_EXTENSION_UPDATE_FOUND,
       Source<Profile>(profile_),
       Details<const std::string>(&extension_id));
 }
@@ -1222,7 +1223,7 @@ void ExtensionUpdater::NotifyUpdateFound(const std::string& extension_id) {
 void ExtensionUpdater::NotifyIfFinished() {
   if (in_progress_ids_.empty()) {
     NotificationService::current()->Notify(
-        NotificationType::EXTENSION_UPDATING_FINISHED,
+        chrome::NOTIFICATION_EXTENSION_UPDATING_FINISHED,
         Source<Profile>(profile_),
         NotificationService::NoDetails());
     VLOG(1) << "Sending EXTENSION_UPDATING_FINISHED";
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index 1be1439..d2db59e 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -332,7 +332,7 @@ class ExtensionUpdater : public URLFetcher::Delegate,
   bool MaybeInstallCRXFile();
 
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc
index 08d1518..115c0b9 100644
--- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc
+++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc
@@ -40,7 +40,7 @@ bool WebSocketProxyPrivateGetPassportForTCPFunction::RunImpl() {
     if (!chromeos::WebSocketProxyController::IsInitiated()) {
       delay_response = true;
       registrar_.Add(
-          this, NotificationType::WEB_SOCKET_PROXY_STARTED,
+          this, chrome::WEB_SOCKET_PROXY_STARTED,
           NotificationService::AllSources());
       chromeos::WebSocketProxyController::Initiate();
     }
@@ -67,10 +67,10 @@ bool WebSocketProxyPrivateGetPassportForTCPFunction::RunImpl() {
 }
 
 void WebSocketProxyPrivateGetPassportForTCPFunction::Observe(
-    NotificationType type, const NotificationSource& source,
+    int type, const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
-  DCHECK(type.value == NotificationType::WEB_SOCKET_PROXY_STARTED);
+  DCHECK(type == chrome::WEB_SOCKET_PROXY_STARTED);
 #else
   NOTREACHED();
 #endif
diff --git a/chrome/browser/extensions/extension_web_socket_proxy_private_api.h b/chrome/browser/extensions/extension_web_socket_proxy_private_api.h
index e65a034..ece09a4 100644
--- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.h
+++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.h
@@ -24,7 +24,7 @@ class WebSocketProxyPrivateGetPassportForTCPFunction
 
   // NotificationObserver implementation.
   virtual void Observe(
-      NotificationType type, const NotificationSource& source,
+      int type, const NotificationSource& source,
       const NotificationDetails& details) OVERRIDE;
 
   // Finalizes async operation.
diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc
index 513760e..bf395ab 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.cc
+++ b/chrome/browser/extensions/extension_webnavigation_api.cc
@@ -255,17 +255,17 @@ ExtensionWebNavigationEventRouter::~ExtensionWebNavigationEventRouter() {}
 void ExtensionWebNavigationEventRouter::Init() {
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
-                   NotificationType::CREATING_NEW_WINDOW,
+                   content::NOTIFICATION_CREATING_NEW_WINDOW,
                    NotificationService::AllSources());
   }
 }
 
 void ExtensionWebNavigationEventRouter::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  switch (type.value) {
-    case NotificationType::CREATING_NEW_WINDOW:
+  switch (type) {
+    case content::NOTIFICATION_CREATING_NEW_WINDOW:
       CreatingNewWindow(
           Source<TabContents>(source).ptr(),
           Details<const ViewHostMsg_CreateWindow_Params>(details).ptr());
diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h
index 431507d..e2e3816 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.h
+++ b/chrome/browser/extensions/extension_webnavigation_api.h
@@ -141,7 +141,7 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc
index 4fe40ed..b0a6445 100644
--- a/chrome/browser/extensions/extension_webstore_private_api.cc
+++ b/chrome/browser/extensions/extension_webstore_private_api.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -28,7 +29,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
@@ -591,10 +591,10 @@ bool PromptBrowserLoginFunction::RunImpl() {
   // Start listening for notifications about the token.
   TokenService* token_service = profile->GetTokenService();
   registrar_.Add(this,
-                 NotificationType::TOKEN_AVAILABLE,
+                 chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  Source<TokenService>(token_service));
   registrar_.Add(this,
-                 NotificationType::TOKEN_REQUEST_FAILED,
+                 chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                  Source<TokenService>(token_service));
 
   GetBrowserSignin(profile)->RequestSignin(tab,
@@ -646,16 +646,16 @@ void PromptBrowserLoginFunction::OnLoginFailure(
   Release();
 }
 
-void PromptBrowserLoginFunction::Observe(NotificationType type,
+void PromptBrowserLoginFunction::Observe(int type,
                                          const NotificationSource& source,
                                          const NotificationDetails& details) {
   // Make sure this notification is for the service we are interested in.
   std::string service;
-  if (type == NotificationType::TOKEN_AVAILABLE) {
+  if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     TokenService::TokenAvailableDetails* available =
         Details<TokenService::TokenAvailableDetails>(details).ptr();
     service = available->service();
-  } else if (type == NotificationType::TOKEN_REQUEST_FAILED) {
+  } else if (type == chrome::NOTIFICATION_TOKEN_REQUEST_FAILED) {
     TokenService::TokenRequestFailedDetails* failed =
         Details<TokenService::TokenRequestFailedDetails>(details).ptr();
     service = failed->service();
diff --git a/chrome/browser/extensions/extension_webstore_private_api.h b/chrome/browser/extensions/extension_webstore_private_api.h
index 0a6dd0a..59ee0a1 100644
--- a/chrome/browser/extensions/extension_webstore_private_api.h
+++ b/chrome/browser/extensions/extension_webstore_private_api.h
@@ -148,7 +148,7 @@ class PromptBrowserLoginFunction : public AsyncExtensionFunction,
   virtual void OnLoginFailure(const GoogleServiceAuthError& error);
 
   // Implements the NotificationObserver interface.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/extension_webstore_private_apitest.cc b/chrome/browser/extensions/extension_webstore_private_apitest.cc
index 9bd6ac8..41c17d0c 100644
--- a/chrome/browser/extensions/extension_webstore_private_apitest.cc
+++ b/chrome/browser/extensions/extension_webstore_private_apitest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/common/notification_observer.h"
@@ -91,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallNoGesture) {
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,
                        IncorrectManifest1) {
   ui_test_utils::WindowedNotificationObserver observer(
-      NotificationType::EXTENSION_INSTALL_ERROR,
+      chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
       NotificationService::AllSources());
   ASSERT_TRUE(RunInstallTest("incorrect_manifest1.html", "extension.crx"));
   observer.Wait();
@@ -100,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,
                        IncorrectManifest2) {
   ui_test_utils::WindowedNotificationObserver observer(
-      NotificationType::EXTENSION_INSTALL_ERROR,
+      chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
       NotificationService::AllSources());
   ASSERT_TRUE(RunInstallTest("incorrect_manifest2.html", "extension.crx"));
   observer.Wait();
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index 3b7729a..915f2ce 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -28,6 +28,7 @@
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/url_pattern.h"
@@ -41,8 +42,8 @@
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
@@ -290,31 +291,31 @@ void ExtensionsDOMHandler::HandleRequestExtensionsData(const ListValue* args) {
 
 void ExtensionsDOMHandler::RegisterForNotifications() {
   // Register for notifications that we need to reload the page.
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
       NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_PROCESS_CREATED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_CREATED,
       NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
       NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::NAV_ENTRY_COMMITTED,
+      content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::RENDER_VIEW_HOST_CREATED,
+      content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::RENDER_VIEW_HOST_DELETED,
+      content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::BACKGROUND_CONTENTS_NAVIGATED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::BACKGROUND_CONTENTS_DELETED,
+      chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       NotificationService::AllSources());
   registrar_.Add(this,
-      NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
+      chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
       NotificationService::AllSources());
 }
 
@@ -617,10 +618,10 @@ void ExtensionsDOMHandler::MultiFilesSelected(
   NOTREACHED();
 }
 
-void ExtensionsDOMHandler::Observe(NotificationType type,
+void ExtensionsDOMHandler::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
-  switch (type.value) {
+  switch (type) {
     // We listen for notifications that will result in the page being
     // repopulated with data twice for the same event in certain cases.
     // For instance, EXTENSION_LOADED & EXTENSION_PROCESS_CREATED because
@@ -635,22 +636,22 @@ void ExtensionsDOMHandler::Observe(NotificationType type,
     //
     // Doing it this way gets everything but causes the page to be rendered
     // more than we need. It doesn't seem to result in any noticeable flicker.
-    case NotificationType::RENDER_VIEW_HOST_DELETED:
+    case content::NOTIFICATION_RENDER_VIEW_HOST_DELETED:
       deleting_rvh_ = Source<RenderViewHost>(source).ptr();
       MaybeUpdateAfterNotification();
       break;
-    case NotificationType::BACKGROUND_CONTENTS_DELETED:
+    case chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED:
       deleting_rvh_ = Details<BackgroundContents>(details)->render_view_host();
       MaybeUpdateAfterNotification();
       break;
-    case NotificationType::EXTENSION_LOADED:
-    case NotificationType::EXTENSION_PROCESS_CREATED:
-    case NotificationType::EXTENSION_UNLOADED:
-    case NotificationType::EXTENSION_UPDATE_DISABLED:
-    case NotificationType::RENDER_VIEW_HOST_CREATED:
-    case NotificationType::NAV_ENTRY_COMMITTED:
-    case NotificationType::BACKGROUND_CONTENTS_NAVIGATED:
-    case NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED:
+    case chrome::NOTIFICATION_EXTENSION_LOADED:
+    case chrome::NOTIFICATION_EXTENSION_PROCESS_CREATED:
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED:
+    case chrome::NOTIFICATION_EXTENSION_UPDATE_DISABLED:
+    case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED:
+    case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
+    case chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED:
+    case chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED:
       MaybeUpdateAfterNotification();
       break;
     default:
diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h
index d8ba972..2b20716 100644
--- a/chrome/browser/extensions/extensions_ui.h
+++ b/chrome/browser/extensions/extensions_ui.h
@@ -154,7 +154,7 @@ class ExtensionsDOMHandler : public WebUIMessageHandler,
   virtual void FileSelectionCanceled(void* params) {}
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/external_policy_extension_loader.cc b/chrome/browser/extensions/external_policy_extension_loader.cc
index 4d9401e..69cc317 100644
--- a/chrome/browser/extensions/external_policy_extension_loader.cc
+++ b/chrome/browser/extensions/external_policy_extension_loader.cc
@@ -11,8 +11,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ -41,7 +41,7 @@ ExternalPolicyExtensionLoader::ExternalPolicyExtensionLoader(
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(prefs::kExtensionInstallForceList, this);
   notification_registrar_.Add(this,
-                              NotificationType::PROFILE_DESTROYED,
+                              chrome::NOTIFICATION_PROFILE_DESTROYED,
                               Source<Profile>(profile_));
 }
 
@@ -73,12 +73,12 @@ void ExternalPolicyExtensionLoader::StartLoading() {
 }
 
 void ExternalPolicyExtensionLoader::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   if (profile_ == NULL) return;
-  switch (type.value) {
-    case NotificationType::PREF_CHANGED: {
+  switch (type) {
+    case chrome::NOTIFICATION_PREF_CHANGED: {
       if (Source<PrefService>(source).ptr() == profile_->GetPrefs()) {
         std::string* pref_name = Details<std::string>(details).ptr();
         if (*pref_name == prefs::kExtensionInstallForceList) {
@@ -89,7 +89,7 @@ void ExternalPolicyExtensionLoader::Observe(
       }
       break;
     }
-    case NotificationType::PROFILE_DESTROYED: {
+    case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       if (Source<Profile>(source).ptr() == profile_) {
         notification_registrar_.RemoveAll();
         pref_change_registrar_.RemoveAll();
diff --git a/chrome/browser/extensions/external_policy_extension_loader.h b/chrome/browser/extensions/external_policy_extension_loader.h
index 3d36b94..d346daca 100644
--- a/chrome/browser/extensions/external_policy_extension_loader.h
+++ b/chrome/browser/extensions/external_policy_extension_loader.h
@@ -26,7 +26,7 @@ class ExternalPolicyExtensionLoader
   explicit ExternalPolicyExtensionLoader(Profile* profile);
 
   // NotificationObserver implementation
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 5f7ffa8..9fab9cb 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -8,8 +8,8 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/browser_thread.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
@@ -121,7 +121,7 @@ class ImageLoadingTracker::ImageLoader
 ImageLoadingTracker::ImageLoadingTracker(Observer* observer)
     : observer_(observer),
       next_id_(0) {
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  NotificationService::AllSources());
 }
 
@@ -179,10 +179,10 @@ void ImageLoadingTracker::OnImageLoaded(
   observer_->OnImageLoaded(image, resource, id);
 }
 
-void ImageLoadingTracker::Observe(NotificationType type,
+void ImageLoadingTracker::Observe(int type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
-  DCHECK(type == NotificationType::EXTENSION_UNLOADED);
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED);
 
   const Extension* extension =
       Details<UnloadedExtensionInfo>(details)->extension;
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index ca0d863..a48a6ef 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -86,7 +86,7 @@ class ImageLoadingTracker : public NotificationObserver {
 
   // NotificationObserver method. If an extension is uninstalled while we're
   // waiting for the image we remove the entry from load_map_.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index f98edb7..6e85d8a 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
@@ -12,7 +13,6 @@
 #include "content/browser/browser_thread.h"
 #include "content/common/json_value_serializer.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"
@@ -163,7 +163,7 @@ TEST_F(ImageLoadingTrackerTest, DeleteExtensionWhileWaitingForCache) {
   UnloadedExtensionInfo details(extension.get(),
                                 UnloadedExtensionInfo::UNINSTALL);
   NotificationService::current()->Notify(
-      NotificationType::EXTENSION_UNLOADED,
+      chrome::NOTIFICATION_EXTENSION_UNLOADED,
       NotificationService::AllSources(),
       Details<UnloadedExtensionInfo>(&details));
 
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
index 040963f..27e9c03 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ -33,7 +34,7 @@ ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate(
       previous_using_native_theme_(previous_using_native_theme),
       tab_contents_(tab_contents) {
   theme_service_->OnInfobarDisplayed();
-  registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  Source<ThemeService>(theme_service_));
 }
 
@@ -97,10 +98,10 @@ string16 ThemeInstalledInfoBarDelegate::GetButtonLabel(
 }
 
 void ThemeInstalledInfoBarDelegate::Observe(
-    NotificationType type,
+    int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  DCHECK_EQ(NotificationType::BROWSER_THEME_CHANGED, type.value);
+  DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
   // If the new theme is different from what this info bar is associated
   // with, close this info bar since it is no longer relevant.
   if (theme_id_ != theme_service_->GetThemeID()) {
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index 9efa54a..581b143 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -48,7 +48,7 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate,
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
 
   // NotificationObserver:
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index dcc64c8..ea94bd1 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "content/browser/browser_thread.h"
@@ -19,11 +20,11 @@ UserScriptListener::UserScriptListener()
       user_scripts_ready_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::USER_SCRIPTS_UPDATED,
+  registrar_.Add(this, chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
                  NotificationService::AllSources());
   AddRef();  // Will be balanced in Cleanup().
 }
@@ -120,13 +121,13 @@ void UserScriptListener::CollectURLPatterns(const Extension* extension,
   }
 }
 
-void UserScriptListener::Observe(NotificationType type,
+void UserScriptListener::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  switch (type.value) {
-    case NotificationType::EXTENSION_LOADED: {
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSION_LOADED: {
       const Extension* extension = Details<const Extension>(details).ptr();
       if (extension->content_scripts().empty())
         return;  // no new patterns from this extension.
@@ -143,7 +144,7 @@ void UserScriptListener::Observe(NotificationType type,
       break;
     }
 
-    case NotificationType::EXTENSION_UNLOADED: {
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* unloaded_extension =
           Details<UnloadedExtensionInfo>(details)->extension;
       if (unloaded_extension->content_scripts().empty())
@@ -165,7 +166,7 @@ void UserScriptListener::Observe(NotificationType type,
       break;
     }
 
-    case NotificationType::USER_SCRIPTS_UPDATED: {
+    case chrome::NOTIFICATION_USER_SCRIPTS_UPDATED: {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           NewRunnableMethod(this, &UserScriptListener::StartDelayedRequests));
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index da61a36..5ebae08 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -89,7 +89,7 @@ class UserScriptListener
   void CollectURLPatterns(const Extension* extension, URLPatterns* patterns);
 
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index e7c912d..cbe946d 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/threading/thread.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/browser/extensions/user_script_listener.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "content/browser/mock_resource_context.h"
@@ -14,7 +15,6 @@
 #include "content/browser/renderer_host/resource_handler.h"
 #include "content/browser/renderer_host/resource_queue.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
@@ -184,7 +184,7 @@ TEST_F(UserScriptListenerTest, DelayAndUpdate) {
   ASSERT_FALSE(request->is_pending());
 
   NotificationService::current()->Notify(
-      NotificationType::USER_SCRIPTS_UPDATED,
+      chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
       Source<Profile>(profile_.get()),
       NotificationService::NoDetails());
   MessageLoop::current()->RunAllPending();
@@ -207,7 +207,7 @@ TEST_F(UserScriptListenerTest, DelayAndUnload) {
   ASSERT_FALSE(request->is_pending());
 
   NotificationService::current()->Notify(
-      NotificationType::USER_SCRIPTS_UPDATED,
+      chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
       Source<Profile>(profile_.get()),
       NotificationService::NoDetails());
   MessageLoop::current()->RunAllPending();
diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc
index 3772ac6..96ade99b 100644
--- a/chrome/browser/extensions/user_script_master.cc
+++ b/chrome/browser/extensions/user_script_master.cc
@@ -16,6 +16,7 @@
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
@@ -250,13 +251,13 @@ UserScriptMaster::UserScriptMaster(Profile* profile)
     : extensions_service_ready_(false),
       pending_load_(false),
       profile_(profile) {
-  registrar_.Add(this, NotificationType::EXTENSIONS_READY,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  Source<Profile>(profile_));
-  registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  Source<Profile>(profile_));
-  registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  Source<Profile>(profile_));
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
+  registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  NotificationService::AllSources());
 }
 
@@ -286,22 +287,22 @@ void UserScriptMaster::NewScriptsAvailable(base::SharedMemory* handle) {
     }
 
     NotificationService::current()->Notify(
-        NotificationType::USER_SCRIPTS_UPDATED,
+        chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
         Source<Profile>(profile_),
         Details<base::SharedMemory>(handle));
   }
 }
 
-void UserScriptMaster::Observe(NotificationType type,
+void UserScriptMaster::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   bool should_start_load = false;
-  switch (type.value) {
-    case NotificationType::EXTENSIONS_READY:
+  switch (type) {
+    case chrome::NOTIFICATION_EXTENSIONS_READY:
       extensions_service_ready_ = true;
       should_start_load = true;
       break;
-    case NotificationType::EXTENSION_LOADED: {
+    case chrome::NOTIFICATION_EXTENSION_LOADED: {
       // Add any content scripts inside the extension.
       const Extension* extension = Details<const Extension>(details).ptr();
       bool incognito_enabled = profile_->GetExtensionService()->
@@ -316,7 +317,7 @@ void UserScriptMaster::Observe(NotificationType type,
         should_start_load = true;
       break;
     }
-    case NotificationType::EXTENSION_UNLOADED: {
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       // Remove any content scripts.
       const Extension* extension =
           Details<UnloadedExtensionInfo>(details)->extension;
@@ -334,7 +335,7 @@ void UserScriptMaster::Observe(NotificationType type,
 
       break;
     }
-    case NotificationType::RENDERER_PROCESS_CREATED: {
+    case content::NOTIFICATION_RENDERER_PROCESS_CREATED: {
       RenderProcessHost* process = Source<RenderProcessHost>(source).ptr();
       if (ScriptsReady())
         SendUpdate(process, GetSharedMemory());
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index f45e11e..2df53d8 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -113,7 +113,7 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
 
  private:
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index c38f7f6..c5d6af1 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -12,6 +12,7 @@
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_registrar.h"
@@ -33,7 +34,7 @@ class UserScriptMasterTest : public testing::Test,
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // Register for all user script notifications.
-    registrar_.Add(this, NotificationType::USER_SCRIPTS_UPDATED,
+    registrar_.Add(this, chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
                    NotificationService::AllSources());
 
     // UserScriptMaster posts tasks to the file thread so make the current
@@ -49,10 +50,10 @@ class UserScriptMasterTest : public testing::Test,
     ui_thread_.reset();
   }
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
-    DCHECK(type == NotificationType::USER_SCRIPTS_UPDATED);
+    DCHECK(type == chrome::NOTIFICATION_USER_SCRIPTS_UPDATED);
 
     shared_memory_ = Details<base::SharedMemory>(details).ptr();
     if (MessageLoop::current() == &message_loop_)