| Index: mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| similarity index 96%
|
| copy from third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| copy to mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| index 35c9d2e41a267167e2044961855897b0e0fb1974..32bd78d07ee49ada0be7d3a877bdb51549e89c6c 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| +++ b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
|
| @@ -14,7 +14,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace mojo {
|
| -namespace system {
|
| +namespace edk {
|
| namespace {
|
|
|
| // NOTE(vtl): There's currently not much to test for in
|
| @@ -45,10 +45,10 @@ class SharedBufferDispatcherTest : public testing::Test {
|
| SharedBufferDispatcherTest() {}
|
| ~SharedBufferDispatcherTest() override {}
|
|
|
| - embedder::PlatformSupport* platform_support() { return &platform_support_; }
|
| + PlatformSupport* platform_support() { return &platform_support_; }
|
|
|
| private:
|
| - embedder::SimplePlatformSupport platform_support_;
|
| + SimplePlatformSupport platform_support_;
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(SharedBufferDispatcherTest);
|
| };
|
| @@ -122,7 +122,7 @@ TEST_F(SharedBufferDispatcherTest, CreateAndMapBuffer) {
|
| EXPECT_EQ(Dispatcher::Type::SHARED_BUFFER, dispatcher->GetType());
|
|
|
| // Make a couple of mappings.
|
| - scoped_ptr<embedder::PlatformSharedBufferMapping> mapping1;
|
| + scoped_ptr<PlatformSharedBufferMapping> mapping1;
|
| EXPECT_EQ(MOJO_RESULT_OK, dispatcher->MapBuffer(
|
| 0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping1));
|
| ASSERT_TRUE(mapping1);
|
| @@ -131,7 +131,7 @@ TEST_F(SharedBufferDispatcherTest, CreateAndMapBuffer) {
|
| // Write something.
|
| static_cast<char*>(mapping1->GetBase())[50] = 'x';
|
|
|
| - scoped_ptr<embedder::PlatformSharedBufferMapping> mapping2;
|
| + scoped_ptr<PlatformSharedBufferMapping> mapping2;
|
| EXPECT_EQ(MOJO_RESULT_OK, dispatcher->MapBuffer(
|
| 50, 50, MOJO_MAP_BUFFER_FLAG_NONE, &mapping2));
|
| ASSERT_TRUE(mapping2);
|
| @@ -155,7 +155,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandle) {
|
| 100, &dispatcher1));
|
|
|
| // Map and write something.
|
| - scoped_ptr<embedder::PlatformSharedBufferMapping> mapping;
|
| + scoped_ptr<PlatformSharedBufferMapping> mapping;
|
| EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->MapBuffer(
|
| 0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
|
| static_cast<char*>(mapping->GetBase())[0] = 'x';
|
| @@ -258,7 +258,7 @@ TEST_F(SharedBufferDispatcherTest, MapBufferInvalidArguments) {
|
| SharedBufferDispatcher::kDefaultCreateOptions,
|
| 100, &dispatcher));
|
|
|
| - scoped_ptr<embedder::PlatformSharedBufferMapping> mapping;
|
| + scoped_ptr<PlatformSharedBufferMapping> mapping;
|
| EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
|
| dispatcher->MapBuffer(0, 101, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
|
| EXPECT_FALSE(mapping);
|
| @@ -275,5 +275,5 @@ TEST_F(SharedBufferDispatcherTest, MapBufferInvalidArguments) {
|
| }
|
|
|
| } // namespace
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|