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

Unified Diff: mojo/edk/test/multiprocess_test_helper_unittest.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 2 months 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
Index: mojo/edk/test/multiprocess_test_helper_unittest.cc
diff --git a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc b/mojo/edk/test/multiprocess_test_helper_unittest.cc
similarity index 91%
copy from third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc
copy to mojo/edk/test/multiprocess_test_helper_unittest.cc
index eb110d10459ab392c0312df0f8b434dda660b917..b3ae11d84020b6c3faee7d63c74b05393bf76ac9 100644
--- a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc
+++ b/mojo/edk/test/multiprocess_test_helper_unittest.cc
@@ -2,23 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/edk/test/multiprocess_test_helper.h"
#include "base/logging.h"
#include "build/build_config.h"
+#include "mojo/edk/embedder/scoped_platform_handle.h"
+#include "mojo/edk/test/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
-#include "third_party/mojo/src/mojo/edk/test/test_utils.h"
#if defined(OS_POSIX)
#include <fcntl.h>
#endif
namespace mojo {
+namespace edk {
namespace test {
namespace {
-bool IsNonBlocking(const embedder::PlatformHandle& handle) {
+bool IsNonBlocking(const PlatformHandle& handle) {
#if defined(OS_WIN)
// Haven't figured out a way to query whether a HANDLE was created with
// FILE_FLAG_OVERLAPPED.
@@ -28,13 +29,13 @@ bool IsNonBlocking(const embedder::PlatformHandle& handle) {
#endif
}
-bool WriteByte(const embedder::PlatformHandle& handle, char c) {
+bool WriteByte(const PlatformHandle& handle, char c) {
size_t bytes_written = 0;
BlockingWrite(handle, &c, 1, &bytes_written);
return bytes_written == 1;
}
-bool ReadByte(const embedder::PlatformHandle& handle, char* c) {
+bool ReadByte(const PlatformHandle& handle, char* c) {
size_t bytes_read = 0;
BlockingRead(handle, c, 1, &bytes_read);
return bytes_read == 1;
@@ -86,7 +87,7 @@ TEST_F(MultiprocessTestHelperTest, MAYBE_PassedChannel) {
helper.StartChild("PassedChannel");
// Take ownership of the handle.
- embedder::ScopedPlatformHandle handle = helper.server_platform_handle.Pass();
+ ScopedPlatformHandle handle = helper.server_platform_handle.Pass();
// The handle should be non-blocking.
EXPECT_TRUE(IsNonBlocking(handle.get()));
@@ -108,7 +109,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(PassedChannel) {
CHECK(MultiprocessTestHelper::client_platform_handle.is_valid());
// Take ownership of the handle.
- embedder::ScopedPlatformHandle handle =
+ ScopedPlatformHandle handle =
MultiprocessTestHelper::client_platform_handle.Pass();
// The handle should be non-blocking.
@@ -191,4 +192,5 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(ChildTestFailsExpect) {
} // namespace
} // namespace test
+} // namespace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698