Index: mojo/edk/system/platform_handle_dispatcher_unittest.cc |
diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc b/mojo/edk/system/platform_handle_dispatcher_unittest.cc |
similarity index 86% |
copy from third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc |
copy to mojo/edk/system/platform_handle_dispatcher_unittest.cc |
index 1f25adf9501261a9550fa26c39de456a6b3b046f..77f4761c79eefd52c2b8eca0c9f07207072df7d4 100644 |
--- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc |
+++ b/mojo/edk/system/platform_handle_dispatcher_unittest.cc |
@@ -2,7 +2,7 @@ |
// 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/system/platform_handle_dispatcher.h" |
+#include "mojo/edk/system/platform_handle_dispatcher.h" |
#include <stdio.h> |
@@ -11,11 +11,11 @@ |
#include "base/files/scoped_file.h" |
#include "base/files/scoped_temp_dir.h" |
#include "base/memory/ref_counted.h" |
+#include "mojo/edk/test/test_utils.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "third_party/mojo/src/mojo/edk/test/test_utils.h" |
namespace mojo { |
-namespace system { |
+namespace edk { |
namespace { |
TEST(PlatformHandleDispatcherTest, Basic) { |
@@ -31,8 +31,7 @@ TEST(PlatformHandleDispatcherTest, Basic) { |
EXPECT_EQ(sizeof(kHelloWorld), |
fwrite(kHelloWorld, 1, sizeof(kHelloWorld), fp.get())); |
- embedder::ScopedPlatformHandle h( |
- mojo::test::PlatformHandleFromFILE(fp.Pass())); |
+ ScopedPlatformHandle h(test::PlatformHandleFromFILE(fp.Pass())); |
EXPECT_FALSE(fp); |
ASSERT_TRUE(h.is_valid()); |
@@ -44,7 +43,7 @@ TEST(PlatformHandleDispatcherTest, Basic) { |
h = dispatcher->PassPlatformHandle().Pass(); |
EXPECT_TRUE(h.is_valid()); |
- fp = mojo::test::FILEFromPlatformHandle(h.Pass(), "rb").Pass(); |
+ fp = test::FILEFromPlatformHandle(h.Pass(), "rb").Pass(); |
EXPECT_FALSE(h.is_valid()); |
EXPECT_TRUE(fp); |
@@ -74,7 +73,7 @@ TEST(PlatformHandleDispatcherTest, CreateEquivalentDispatcherAndClose) { |
scoped_refptr<PlatformHandleDispatcher> dispatcher = |
PlatformHandleDispatcher::Create( |
- mojo::test::PlatformHandleFromFILE(fp.Pass())); |
+ test::PlatformHandleFromFILE(fp.Pass())); |
DispatcherTransport transport( |
test::DispatcherTryStartTransport(dispatcher.get())); |
@@ -93,7 +92,7 @@ TEST(PlatformHandleDispatcherTest, CreateEquivalentDispatcherAndClose) { |
ASSERT_EQ(Dispatcher::Type::PLATFORM_HANDLE, generic_dispatcher->GetType()); |
dispatcher = static_cast<PlatformHandleDispatcher*>(generic_dispatcher.get()); |
- fp = mojo::test::FILEFromPlatformHandle(dispatcher->PassPlatformHandle(), |
+ fp = test::FILEFromPlatformHandle(dispatcher->PassPlatformHandle(), |
"rb").Pass(); |
EXPECT_TRUE(fp); |
@@ -107,5 +106,5 @@ TEST(PlatformHandleDispatcherTest, CreateEquivalentDispatcherAndClose) { |
} |
} // namespace |
-} // namespace system |
+} // namespace edk |
} // namespace mojo |