summaryrefslogtreecommitdiffstats
path: root/base/message_loop_unittest.cc
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 08:45:51 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-01 08:45:51 +0000
commit5cffdfd2397b2fc51e1597779cd4ce4bde9180e3 (patch)
tree72e0591bd92eb214eaebbfb01ac8fa2e7b06a146 /base/message_loop_unittest.cc
parentb06ea9f4829138efafc5c750af7fa532a40518d6 (diff)
downloadchromium_src-5cffdfd2397b2fc51e1597779cd4ce4bde9180e3.zip
chromium_src-5cffdfd2397b2fc51e1597779cd4ce4bde9180e3.tar.gz
chromium_src-5cffdfd2397b2fc51e1597779cd4ce4bde9180e3.tar.bz2
Help make Base compile under NaCl
This patch is a first attempt to get MessageLoop working inside NaCl. I suspect we'll need to do something more complicated at some point, but this version passes at least a few of the unit tests. Review URL: http://codereview.chromium.org/5435001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop_unittest.cc')
-rw-r--r--base/message_loop_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index 537c606..a196519 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -1576,7 +1576,7 @@ TEST(MessageLoopTest, HighResolutionTimer) {
#endif // defined(OS_WIN)
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_NACL)
namespace {
@@ -1646,7 +1646,7 @@ TEST(MessageLoopTest, FileDescriptorWatcherDoubleStop) {
} // namespace
-#endif // defined(OS_POSIX)
+#endif // defined(OS_POSIX) && !defined(OS_NACL)
namespace {
class RunAtDestructionTask : public Task {