Build fixes for chromiumos. Will send out a new patch fixing checkdeps failures in a bit.

BUG=none
TEST=compiles
TBR=joi
Review URL: http://codereview.chromium.org/7324042

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

2 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index b409c43..ee8831f 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -113,7 +114,7 @@ TEST_F(ProfileManagerTest, LoggedInProfileDir) {
   EXPECT_EQ(expected_default.value(),
             profile_manager_->GetCurrentProfileDir().value());
 
-  profile_manager_->Observe(chrome::LOGIN_USER_CHANGED,
+  profile_manager_->Observe(chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                            NotificationService::AllSources(),
                            NotificationService::NoDetails());
   FilePath expected_logged_in(profile_dir);
diff --git a/chrome/browser/ui/views/file_manager_dialog_browsertest.cc b/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
index 35c98b4..9ca7d5c 100644
--- a/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
+++ b/chrome/browser/ui/views/file_manager_dialog_browsertest.cc
@@ -21,6 +21,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/common/content_notification_types.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_path_manager.h"
@@ -130,7 +131,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, SelectFileAndCancel) {
   // Inject JavaScript to click the cancel button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
-      chrome::RENDER_WIDGET_HOST_DESTROYED,
+      content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
@@ -194,7 +195,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, SelectFileAndOpen) {
   // Inject JavaScript to click the open button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
-      chrome::RENDER_WIDGET_HOST_DESTROYED,
+      content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;
@@ -254,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerDialogTest, SelectFileAndSave) {
   // Inject JavaScript to click the save button and wait for notification
   // that the window has closed.
   ui_test_utils::WindowedNotificationObserver host_destroyed(
-      chrome::RENDER_WIDGET_HOST_DESTROYED,
+      content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       NotificationService::AllSources());
   RenderViewHost* host = dialog_->GetRenderViewHost();
   string16 main_frame;