Make the new Mojo EDK work on XP.

mojo/edk/system/core_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/core.h"
 
 #include <stdint.h>
 
 #include <limits>
 
 #include "base/bind.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/system/awakable.h"
 #include "mojo/edk/system/core_test_base.h"
 #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 {
 
 const MojoHandleSignalsState kEmptyMojoHandleSignalsState = {0u, 0u};
 const MojoHandleSignalsState kFullMojoHandleSignalsState = {~0u, ~0u};
 const MojoHandleSignals kAllSignals = MOJO_HANDLE_SIGNAL_READABLE |
                                       MOJO_HANDLE_SIGNAL_WRITABLE |
                                       MOJO_HANDLE_SIGNAL_PEER_CLOSED;
 
@@ skipping 679 matching lines @@
   ASSERT_EQ(kHelloSize, num_bytes);
   ASSERT_STREQ(kHello, buffer);
   ASSERT_EQ(0u, num_handles);
 
   // Make sure that you can't pass either of the message pipe's handles over
   // itself.
   ASSERT_EQ(MOJO_RESULT_BUSY,
             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:
#if ...
  if (xxx) {
    ...
  }
#else
  ...
#endif

[yzshen1, 2015/11/13 18:31:06]

Maybe:

bool write_message = true;
#if defined(OS_WIN)
  write_message = xxxx;
#endif
if (write_message) {
  ...core()->WriteMessage...
}

[jam, 2015/11/13 18:35:46]

yeah i considered the alternatives, but thought i'd do the simplest thing since
this is test code that'll be deleted in a few months :)

+  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,
             core()->CreateMessagePipe(nullptr, &h_passed[0], &h_passed[1]));
 
   // Make sure that |h_passed[]| work properly.
   ASSERT_EQ(MOJO_RESULT_OK,
             core()->WriteMessage(h_passed[0], kHello, kHelloSize, nullptr, 0,
                                  MOJO_WRITE_MESSAGE_FLAG_NONE));
   hss = kEmptyMojoHandleSignalsState;
@@ skipping 525 matching lines @@
   ASSERT_EQ(MOJO_RESULT_BUSY, waiter.result);
 
   ASSERT_EQ(MOJO_RESULT_OK, core()->Close(h));
 }
 
 // TODO(vtl): Test |DuplicateBufferHandle()| and |MapBuffer()|.
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo