More build fixes for linux and chrome os.

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

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

4 files changed, 23 insertions, 15 deletions

diff --git a/chrome/browser/sync/glue/data_type_manager_mock.cc b/chrome/browser/sync/glue/data_type_manager_mock.cc
index 2a21712..a530d51 100644
--- a/chrome/browser/sync/glue/data_type_manager_mock.cc
+++ b/chrome/browser/sync/glue/data_type_manager_mock.cc
@@ -16,20 +16,25 @@ DataTypeManagerMock::DataTypeManagerMock()
   // detail.
     ON_CALL(*this, Configure(testing::_, testing::_)).
     WillByDefault(testing::DoAll(
-        NotifyFromDataTypeManager(this,
-                                  chrome::NOTIFICATION_SYNC_CONFIGURE_START),
-        NotifyFromDataTypeManagerWithResult
-        (this, chrome::NOTIFICATION_SYNC_CONFIGURE_DONE, &result_)));
+        NotifyFromDataTypeManager(
+            this,
+            static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_START)),
+        NotifyFromDataTypeManagerWithResult(
+            this, static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
+            &result_)));
 
   // By default, calling ConfigureWithoutNigori will send a SYNC_CONFIGURE_START
   // and SYNC_CONFIGURE_DONE notification with a DataTypeManager::OK
   // detail.
   ON_CALL(*this, ConfigureWithoutNigori(testing::_, testing::_)).
   WillByDefault(testing::DoAll(
-      NotifyFromDataTypeManager(this,
-                                chrome::NOTIFICATION_SYNC_CONFIGURE_START),
-      NotifyFromDataTypeManagerWithResult
-      (this, chrome::NOTIFICATION_SYNC_CONFIGURE_DONE, &result_)));
+      NotifyFromDataTypeManager(
+          this,
+          static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_START)),
+      NotifyFromDataTypeManagerWithResult(
+          this,
+          static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
+          &result_)));
 }
 
 DataTypeManagerMock::~DataTypeManagerMock() {}
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index beb9673..ce5feec 100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -250,11 +250,13 @@ TEST_F(ProfileSyncServiceStartupTest, SKIP_MACOSX(StartFailure)) {
   browser_sync::DataTypeManager::ConfigureResultWithErrorLocation result(
       configure_result, FROM_HERE, syncable::ModelTypeSet());
   EXPECT_CALL(*data_type_manager, Configure(_, _)).
-      WillRepeatedly(DoAll(NotifyFromDataTypeManager(data_type_manager,
-                         chrome::NOTIFICATION_SYNC_CONFIGURE_START),
-                     NotifyFromDataTypeManagerWithResult(data_type_manager,
-                         chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
-                         &result)));
+      WillRepeatedly(
+          DoAll(
+              NotifyFromDataTypeManager(data_type_manager,
+                  static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_START)),
+              NotifyFromDataTypeManagerWithResult(data_type_manager,
+                  static_cast<int>(chrome::NOTIFICATION_SYNC_CONFIGURE_DONE),
+                  &result)));
   EXPECT_CALL(*data_type_manager, state()).
       WillOnce(Return(DataTypeManager::STOPPED));
 
diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
index 308a001..435d7db 100644
--- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
@@ -68,7 +68,7 @@ class ThumbnailGeneratorTest : public testing::Test {
     // a little scary in that we don't have a RenderView, but the only listener
     // will want a RenderWidget, so it works out OK.
     NotificationService::current()->Notify(
-        chrome::RENDER_VIEW_HOST_CREATED_FOR_TAB,
+        content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
         Source<RenderViewHostManager>(NULL),
         Details<RenderViewHost>(reinterpret_cast<RenderViewHost*>(
             widget_.get())));
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index dffcd35..295b834 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -9,6 +9,7 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros_settings.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
@@ -64,7 +65,7 @@ void CoreChromeOSOptionsHandler::Observe(int type,
   // Ignore the notification if this instance had caused it.
   if (handling_change_)
     return;
-  if (type == chrome::SYSTEM_SETTING_CHANGED) {
+  if (type == chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED) {
     NotifySettingsChanged(Details<std::string>(details).ptr());
     return;
   }