Fix for compile failures caused by the change to move chrome specific notifications out

of content.

BUG=none
TEST=hopefully compiles.
Review URL: http://codereview.chromium.org/7329040

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

18 files changed, 57 insertions, 44 deletions

diff --git a/chrome/browser/automation/automation_provider_observers_chromeos.cc b/chrome/browser/automation/automation_provider_observers_chromeos.cc
index 4eb23c1..3985f15 100644
--- a/chrome/browser/automation/automation_provider_observers_chromeos.cc
+++ b/chrome/browser/automation/automation_provider_observers_chromeos.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 
 using chromeos::CrosLibrary;
@@ -49,7 +50,7 @@ LoginObserver::LoginObserver(chromeos::ExistingUserController* controller,
       automation_(automation->AsWeakPtr()),
       reply_message_(reply_message) {
   controller_->set_login_status_consumer(this);
-  registrar_.Add(this, chrome::LOAD_STOP,
+  registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                  NotificationService::AllSources());
 }
 
@@ -87,7 +88,7 @@ ScreenLockUnlockObserver::ScreenLockUnlockObserver(
     : automation_(automation->AsWeakPtr()),
       reply_message_(reply_message),
       lock_screen_(lock_screen) {
-  registrar_.Add(this, chrome::SCREEN_LOCK_STATE_CHANGED,
+  registrar_.Add(this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
                  NotificationService::AllSources());
 }
 
@@ -96,7 +97,7 @@ ScreenLockUnlockObserver::~ScreenLockUnlockObserver() {}
 void ScreenLockUnlockObserver::Observe(int type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
-  DCHECK(type == chrome::SCREEN_LOCK_STATE_CHANGED);
+  DCHECK(type == chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED);
   if (automation_) {
     AutomationJSONReply reply(automation_, reply_message_.release());
     bool is_screen_locked = *Details<bool>(details).ptr();
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc
index 8a29aa8..b08eafb 100644
--- a/chrome/browser/automation/automation_tab_helper_browsertest.cc
+++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc
@@ -74,7 +74,9 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
     testing::InSequence expect_in_sequence;
     EXPECT_CALL(*mock_tab_observer, OnFirstPendingLoad(_));
     EXPECT_CALL(*mock_notification_observer, Observe(
-        testing::Eq(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE), _, _));
+        testing::Eq(
+            static_cast<int>(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE)),
+            _, _));
     EXPECT_CALL(*mock_tab_observer, OnNoMorePendingLoads(_))
         .WillOnce(testing::InvokeWithoutArgs(
             MessageLoopForUI::current(), &MessageLoop::Quit));
@@ -190,7 +192,9 @@ IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
   {
     testing::InSequence expect_in_sequence;
     EXPECT_CALL(mock_notification_observer, Observe(
-        testing::Eq(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE), _, _));
+        testing::Eq(
+            static_cast<int>(chrome::NOTIFICATION_DOM_OPERATION_RESPONSE)),
+            _, _));
     EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_));
   }
 
diff --git a/chrome/browser/chromeos/login/owner_manager.h b/chrome/browser/chromeos/login/owner_manager.h
index 1ec50cb..d546b02 100644
--- a/chrome/browser/chromeos/login/owner_manager.h
+++ b/chrome/browser/chromeos/login/owner_manager.h
@@ -16,7 +16,6 @@
 
 class FilePath;
 class NotificationDetails;
-class int;
 
 namespace chromeos {
 
diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc
index c0d08ee..55ff741 100644
--- a/chrome/browser/chromeos/login/ownership_service.cc
+++ b/chrome/browser/chromeos/login/ownership_service.cc
@@ -9,6 +9,7 @@
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/browser_thread.h"
 
 // We want to use NewRunnableMethod for non-static methods of this class but
@@ -32,7 +33,7 @@ OwnershipService::OwnershipService()
       ownership_status_(OWNERSHIP_UNKNOWN) {
   notification_registrar_.Add(
       this,
-      chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
+      chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
       NotificationService::AllSources());
 }
 
@@ -152,7 +153,7 @@ void OwnershipService::StartVerifyAttempt(const std::string& data,
 void OwnershipService::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  if (type == chrome::OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
+  if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
     SetStatus(OWNERSHIP_TAKEN);
     notification_registrar_.RemoveAll();
   } else {
diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc
index 078b55d..f23cd8f 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.cc
+++ b/chrome/browser/chromeos/notifications/balloon_view.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -227,7 +228,8 @@ void BalloonViewImpl::Show(Balloon* balloon) {
     html_contents_->EnableWebUI();
   AddChildView(html_contents_->view());
   notification_registrar_.Add(this,
-    chrome::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
+    chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
+    Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
@@ -301,7 +303,7 @@ gfx::Size BalloonViewImpl::GetPreferredSize() {
 void BalloonViewImpl::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  if (type != chrome::NOTIFY_BALLOON_DISCONNECTED) {
+  if (type != chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED) {
     NOTREACHED();
     return;
   }
@@ -309,7 +311,8 @@ void BalloonViewImpl::Observe(int type,
   // If the renderer process attached to this balloon is disconnected
   // (e.g., because of a crash), we want to close the balloon.
   notification_registrar_.Remove(this,
-      chrome::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon_));
+      chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
+      Source<Balloon>(balloon_));
   Close(false);
 }
 
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 115c0b9..1eaf24c 100644
--- a/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc
+++ b/chrome/browser/extensions/extension_web_socket_proxy_private_api.cc
@@ -8,6 +8,7 @@
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/internal_auth.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_service.h"
 
@@ -40,7 +41,7 @@ bool WebSocketProxyPrivateGetPassportForTCPFunction::RunImpl() {
     if (!chromeos::WebSocketProxyController::IsInitiated()) {
       delay_response = true;
       registrar_.Add(
-          this, chrome::WEB_SOCKET_PROXY_STARTED,
+          this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
           NotificationService::AllSources());
       chromeos::WebSocketProxyController::Initiate();
     }
@@ -70,7 +71,7 @@ void WebSocketProxyPrivateGetPassportForTCPFunction::Observe(
     int type, const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
-  DCHECK(type == chrome::WEB_SOCKET_PROXY_STARTED);
+  DCHECK(type == chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED);
 #else
   NOTREACHED();
 #endif
diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc
index 10d3d7a..9ffd31c 100644
--- a/chrome/browser/password_manager/password_store_x.cc
+++ b/chrome/browser/password_manager/password_store_x.cc
@@ -12,6 +12,7 @@
 #include "base/stl_util-inl.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "content/browser/browser_thread.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 
 using std::vector;
@@ -34,7 +35,7 @@ void PasswordStoreX::AddLoginImpl(const PasswordForm& form) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::ADD, form));
     NotificationService::current()->Notify(
-        chrome::LOGINS_CHANGED,
+        chrome::NOTIFICATION_LOGINS_CHANGED,
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
     allow_fallback_ = false;
@@ -49,7 +50,7 @@ void PasswordStoreX::UpdateLoginImpl(const PasswordForm& form) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::UPDATE, form));
     NotificationService::current()->Notify(
-        chrome::LOGINS_CHANGED,
+        chrome::NOTIFICATION_LOGINS_CHANGED,
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
     allow_fallback_ = false;
@@ -64,7 +65,7 @@ void PasswordStoreX::RemoveLoginImpl(const PasswordForm& form) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
     NotificationService::current()->Notify(
-        chrome::LOGINS_CHANGED,
+        chrome::NOTIFICATION_LOGINS_CHANGED,
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
     allow_fallback_ = false;
@@ -88,7 +89,7 @@ void PasswordStoreX::RemoveLoginsCreatedBetweenImpl(
                                             **it));
     }
     NotificationService::current()->Notify(
-        chrome::LOGINS_CHANGED,
+        chrome::NOTIFICATION_LOGINS_CHANGED,
         Source<PasswordStore>(this),
         Details<PasswordStoreChangeList>(&changes));
     allow_fallback_ = false;
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index d4ce662..ab966c9 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -27,7 +28,6 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_transaction_factory.h"
@@ -104,7 +104,7 @@ ProfileManager::ProfileManager() : logged_in_(false) {
 #if defined(OS_CHROMEOS)
   registrar_.Add(
       this,
-      chrome::LOGIN_USER_CHANGED,
+      chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       NotificationService::AllSources());
 #endif
 }
@@ -346,7 +346,7 @@ void ProfileManager::Observe(
     const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
-  if (type == chrome::LOGIN_USER_CHANGED) {
+  if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     if (!command_line.HasSwitch(switches::kTestType)) {
       // This will fail when running on non cros os.
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 9e1f740..77f3961 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -186,7 +186,7 @@ void TabLoader::StartLoading() {
     LoadNextTab();
   } else {
     // Start listening to network state notification now.
-    registrar_.Add(this, chrome::NETWORK_STATE_CHANGED,
+    registrar_.Add(this, chrome::NOTIFICATION_NETWORK_STATE_CHANGED,
                    NotificationService::AllSources());
   }
 #else
@@ -233,7 +233,7 @@ void TabLoader::Observe(int type,
                         const NotificationDetails& details) {
   switch (type) {
 #if defined(OS_CHROMEOS)
-    case chrome::NETWORK_STATE_CHANGED: {
+    case chrome::NOTIFICATION_NETWORK_STATE_CHANGED: {
       chromeos::NetworkStateDetails* state_details =
           Details<chromeos::NetworkStateDetails>(details).ptr();
       switch (state_details->state()) {
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm
index 6c83bc3..40f173c 100644
--- a/chrome/browser/ui/cocoa/info_bubble_window.mm
+++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
@@ -33,7 +33,7 @@ const NSTimeInterval kMinimumTimeInterval =
 class AppNotificationBridge : public NotificationObserver {
  public:
   explicit AppNotificationBridge(InfoBubbleWindow* owner) : owner_(owner) {
-    registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
+    registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                    NotificationService::AllSources());
   }
 
@@ -42,7 +42,7 @@ class AppNotificationBridge : public NotificationObserver {
                const NotificationSource& source,
                const NotificationDetails& details) {
     switch (type) {
-      case chrome::NOTIFICATION_APP_TERMINATING:
+      case content::NOTIFICATION_APP_TERMINATING:
         [owner_ appIsTerminating];
         break;
       default:
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
index 856a550..e618c18 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
@@ -53,7 +53,7 @@ void BookmarkBubbleGtk::BubbleClosing(BubbleGtk* bubble,
   }
 
   NotificationService::current()->Notify(
-      chrome::BOOKMARK_BUBBLE_HIDDEN,
+      chrome::NOTIFICATION_BOOKMARK_BUBBLE_HIDDEN,
       Source<Profile>(profile_->GetOriginalProfile()),
       NotificationService::NoDetails());
 }
diff --git a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
index 7f6800e..668b517 100644
--- a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc
@@ -17,9 +17,9 @@
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
-#include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
index fd76b3b..aa07e4c 100644
--- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc
@@ -337,7 +337,8 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   gtk_widget_show_all(frame_container_);
 
   notification_registrar_.Add(this,
-      chrome::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon));
+      chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
+      Source<Balloon>(balloon));
 }
 
 void BalloonViewImpl::Update() {
@@ -383,11 +384,11 @@ gfx::Rect BalloonViewImpl::GetContentsRectangle() const {
 void BalloonViewImpl::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
-  if (type == chrome::NOTIFY_BALLOON_DISCONNECTED) {
+  if (type == chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED) {
     // If the renderer process attached to this balloon is disconnected
     // (e.g., because of a crash), we want to close the balloon.
     notification_registrar_.Remove(this,
-        chrome::NOTIFY_BALLOON_DISCONNECTED,
+        chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
         Source<Balloon>(balloon_));
     Close(false);
   } else if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
index dc93435..14eef82 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
@@ -213,9 +213,10 @@ OmniboxViewGtk::OmniboxViewGtk(
 }
 
 OmniboxViewGtk::~OmniboxViewGtk() {
-  NotificationService::current()->Notify(chrome::OMNIBOX_DESTROYED,
-                                         Source<OmniboxViewGtk>(this),
-                                         NotificationService::NoDetails());
+  NotificationService::current()->Notify(
+      chrome::NOTIFICATION_OMNIBOX_DESTROYED,
+      Source<OmniboxViewGtk>(this),
+      NotificationService::NoDetails());
 
   // Explicitly teardown members which have a reference to us.  Just to be safe
   // we want them to be destroyed before destroying any other internal state.
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index fb5a267..dfc5574 100644
--- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -15,11 +15,11 @@
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
@@ -444,14 +444,14 @@ void SimUnlockHandler::EnterCode(const std::string& code,
 
 void SimUnlockHandler::NotifyOnEnterPinEnded(bool cancelled) {
   NotificationService::current()->Notify(
-      chrome::ENTER_PIN_ENDED,
+      chrome::NOTIFICATION_ENTER_PIN_ENDED,
       NotificationService::AllSources(),
       Details<bool>(&cancelled));
 }
 
 void SimUnlockHandler::NotifyOnRequirePinChangeEnded(bool new_value) {
   NotificationService::current()->Notify(
-      chrome::REQUIRE_PIN_SETTING_CHANGE_ENDED,
+      chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
       NotificationService::AllSources(),
       Details<bool>(&new_value));
 }
diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
index 25b6630..51edd3b 100644
--- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
+++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -151,7 +152,7 @@ CollectedCookiesUIDelegate::CollectedCookiesUIDelegate(
   HostContentSettingsMap* host_content_settings_map =
       tab_contents_->profile()->GetHostContentSettingsMap();
 
-  registrar_.Add(this, chrome::COLLECTED_COOKIES_SHOWN,
+  registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  Source<TabSpecificContentSettings>(content_settings));
 
   allowed_cookies_tree_model_.reset(
@@ -240,7 +241,7 @@ void CollectedCookiesUIDelegate::AddContentException(
 void CollectedCookiesUIDelegate::Observe(int type,
                                          const NotificationSource& source,
                                          const NotificationDetails& details) {
-  DCHECK_EQ(type, chrome::COLLECTED_COOKIES_SHOWN);
+  DCHECK_EQ(type, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
   CloseDialog();
 }
 
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index cdd7355..528ecef 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -34,9 +34,9 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
-#include "content/common/content_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -52,9 +52,9 @@ static const char kOtherNetworksFakePath[] = "?";
 InternetOptionsHandler::InternetOptionsHandler()
     : chromeos::CrosOptionsPageUIHandler(
           new chromeos::UserCrosSettingsProvider) {
-  registrar_.Add(this, chrome::REQUIRE_PIN_SETTING_CHANGE_ENDED,
+  registrar_.Add(this, chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
       NotificationService::AllSources());
-  registrar_.Add(this, chrome::ENTER_PIN_ENDED,
+  registrar_.Add(this, chrome::NOTIFICATION_ENTER_PIN_ENDED,
       NotificationService::AllSources());
   cros_ = chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (cros_) {
@@ -531,13 +531,13 @@ void InternetOptionsHandler::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   chromeos::CrosOptionsPageUIHandler::Observe(type, source, details);
-  if (type == chrome::REQUIRE_PIN_SETTING_CHANGE_ENDED) {
+  if (type == chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED) {
     bool require_pin = *Details<bool>(details).ptr();
     DictionaryValue dictionary;
     dictionary.SetBoolean("requirePin", require_pin);
     web_ui_->CallJavascriptFunction(
         "options.InternetOptions.updateSecurityTab", dictionary);
-  } else if (type == chrome::ENTER_PIN_ENDED) {
+  } else if (type == chrome::NOTIFICATION_ENTER_PIN_ENDED) {
     // We make an assumption (which is valid for now) that the SIM
     // unlock dialog is put up only when the user is trying to enable
     // mobile data.
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index f5131de..36428cc 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -51,7 +51,7 @@ PersonalOptionsHandler::PersonalOptionsHandler() {
   multiprofile_ = ProfileManager::IsMultipleProfilesEnabled();
 #if defined(OS_CHROMEOS)
   registrar_.Add(this,
-                 chrome::LOGIN_USER_IMAGE_CHANGED,
+                 chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  NotificationService::AllSources());
 #endif
 }
@@ -210,7 +210,7 @@ void PersonalOptionsHandler::Observe(int type,
   if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     ObserveThemeChanged();
 #if defined(OS_CHROMEOS)
-  } else if (type == chrome::LOGIN_USER_IMAGE_CHANGED) {
+  } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
     LoadAccountPicture(NULL);
 #endif
   } else {