Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Unified Diff: mojo/edk/system/core_unittest.cc

Issue 1441853003: Make the new Mojo EDK work on XP. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test fixes Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc ('k') | mojo/edk/system/raw_channel_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/core_unittest.cc
diff --git a/mojo/edk/system/core_unittest.cc b/mojo/edk/system/core_unittest.cc
index 28a038c128fdf95e7b7cab53337d561b4c406d8b..cbbd90555ce9e836f1fd280454c402efa3d90c21 100644
--- a/mojo/edk/system/core_unittest.cc
+++ b/mojo/edk/system/core_unittest.cc
@@ -15,6 +15,10 @@
#include "mojo/edk/system/test_utils.h"
#include "mojo/public/cpp/system/macros.h"
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
namespace mojo {
namespace edk {
namespace {
@@ -714,10 +718,16 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing1) {
core()->WriteMessage(h_passing[0], kHello, kHelloSize,
&h_passing[0], 1,
MOJO_WRITE_MESSAGE_FLAG_NONE));
+#if defined(OS_WIN)
yzshen1 2015/11/13 18:27:07 Please use #if #endif around complete statements:
yzshen1 2015/11/13 18:31:06 Maybe: bool write_message = true; #if defined(OS_
jam 2015/11/13 18:35:46 yeah i considered the alternatives, but thought i'
+ if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
+#endif
ASSERT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
core()->WriteMessage(h_passing[0], kHello, kHelloSize,
&h_passing[1], 1,
MOJO_WRITE_MESSAGE_FLAG_NONE));
+#if defined(OS_WIN)
+ }
+#endif
MojoHandle h_passed[2];
ASSERT_EQ(MOJO_RESULT_OK,
« no previous file with comments | « mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc ('k') | mojo/edk/system/raw_channel_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698