Mojo: Enable RemoteMessagePipeTest on Windows.

R=yzshen@chromium.org

Review URL: https://codereview.chromium.org/183873006

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

4 files changed, 15 insertions, 17 deletions

diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 9bbbaa9..084b182 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -182,7 +182,7 @@
         'system/message_pipe_unittest.cc',
         'system/multiprocess_message_pipe_unittest.cc',
         'system/raw_channel_unittest.cc',
-        'system/remote_message_pipe_posix_unittest.cc',
+        'system/remote_message_pipe_unittest.cc',
         'system/simple_dispatcher_unittest.cc',
         'system/test_utils.cc',
         'system/test_utils.h',
diff --git a/mojo/system/dispatcher.cc b/mojo/system/dispatcher.cc
index c22a73b..0e39d2c 100644
--- a/mojo/system/dispatcher.cc
+++ b/mojo/system/dispatcher.cc
@@ -11,6 +11,16 @@
 namespace mojo {
 namespace system {
 
+namespace test {
+
+// TODO(vtl): Maybe this should be defined in a test-only file instead.
+DispatcherTransport DispatcherTryStartTransport(
+    Dispatcher* dispatcher) {
+  return Dispatcher::CoreImplAccess::TryStartTransport(dispatcher);
+}
+
+}  // namespace test
+
 // Dispatcher ------------------------------------------------------------------
 
 // static
diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
index b4cd526..309e2cd 100644
--- a/mojo/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -30,10 +30,9 @@ class Waiter;
 
 namespace test {
 
-// Test helper.
-// TODO(vtl): We need to declare it here so we can friend it. We define it
-// inline below, but maybe it should be in a test-only file instead.
-DispatcherTransport DispatcherTryStartTransport(Dispatcher* dispatcher);
+// Test helper. We need to declare it here so we can friend it.
+MOJO_SYSTEM_IMPL_EXPORT DispatcherTransport DispatcherTryStartTransport(
+    Dispatcher* dispatcher);
 
 }  // namespace test
 
@@ -327,14 +326,6 @@ class MOJO_SYSTEM_IMPL_EXPORT DispatcherTransport {
   // Copy and assign allowed.
 };
 
-namespace test {
-
-inline DispatcherTransport DispatcherTryStartTransport(Dispatcher* dispatcher) {
-  return Dispatcher::CoreImplAccess::TryStartTransport(dispatcher);
-}
-
-}  // namespace test
-
 }  // namespace system
 }  // namespace mojo
 
diff --git a/mojo/system/remote_message_pipe_posix_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc
index 789c1f9..261d26a 100644
--- a/mojo/system/remote_message_pipe_posix_unittest.cc
+++ b/mojo/system/remote_message_pipe_unittest.cc
@@ -1,10 +1,7 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-// TODO(vtl): The POSIX-specific bits have been factored out. Apply this test to
-// non-POSIX once we have a non-POSIX implementation.
-
 #include <stdint.h>
 #include <string.h>