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

Unified Diff: mojo/system/shared_buffer_dispatcher_unittest.cc

Issue 471773002: Mojo: Add a platform interface for shared memory (embedder::PlatformSharedBuffer). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 6 years, 4 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
« no previous file with comments | « mojo/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/system/shared_buffer_dispatcher_unittest.cc
diff --git a/mojo/system/shared_buffer_dispatcher_unittest.cc b/mojo/system/shared_buffer_dispatcher_unittest.cc
index 0e53330adb9ad09708ba0d91f5d6917f864bf8e2..9713c12ae051c8786261d7bad45fe08a1ac0527a 100644
--- a/mojo/system/shared_buffer_dispatcher_unittest.cc
+++ b/mojo/system/shared_buffer_dispatcher_unittest.cc
@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
+#include "mojo/embedder/platform_shared_buffer.h"
#include "mojo/system/dispatcher.h"
-#include "mojo/system/raw_shared_buffer.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
@@ -109,31 +109,31 @@ TEST(SharedBufferDispatcherTest, CreateAndMapBuffer) {
EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher->GetType());
// Make a couple of mappings.
- scoped_ptr<RawSharedBufferMapping> mapping1;
+ scoped_ptr<embedder::PlatformSharedBufferMapping> mapping1;
EXPECT_EQ(
MOJO_RESULT_OK,
dispatcher->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping1));
ASSERT_TRUE(mapping1);
- ASSERT_TRUE(mapping1->base());
- EXPECT_EQ(100u, mapping1->length());
+ ASSERT_TRUE(mapping1->GetBase());
+ EXPECT_EQ(100u, mapping1->GetLength());
// Write something.
- static_cast<char*>(mapping1->base())[50] = 'x';
+ static_cast<char*>(mapping1->GetBase())[50] = 'x';
- scoped_ptr<RawSharedBufferMapping> mapping2;
+ scoped_ptr<embedder::PlatformSharedBufferMapping> mapping2;
EXPECT_EQ(
MOJO_RESULT_OK,
dispatcher->MapBuffer(50, 50, MOJO_MAP_BUFFER_FLAG_NONE, &mapping2));
ASSERT_TRUE(mapping2);
- ASSERT_TRUE(mapping2->base());
- EXPECT_EQ(50u, mapping2->length());
- EXPECT_EQ('x', static_cast<char*>(mapping2->base())[0]);
+ ASSERT_TRUE(mapping2->GetBase());
+ EXPECT_EQ(50u, mapping2->GetLength());
+ EXPECT_EQ('x', static_cast<char*>(mapping2->GetBase())[0]);
EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
// Check that we can still read/write to mappings after the dispatcher has
// gone away.
- static_cast<char*>(mapping2->base())[1] = 'y';
- EXPECT_EQ('y', static_cast<char*>(mapping1->base())[51]);
+ static_cast<char*>(mapping2->GetBase())[1] = 'y';
+ EXPECT_EQ('y', static_cast<char*>(mapping1->GetBase())[51]);
}
TEST(SharedBufferDispatcher, DuplicateBufferHandle) {
@@ -144,11 +144,11 @@ TEST(SharedBufferDispatcher, DuplicateBufferHandle) {
SharedBufferDispatcher::kDefaultCreateOptions, 100, &dispatcher1));
// Map and write something.
- scoped_ptr<RawSharedBufferMapping> mapping;
+ scoped_ptr<embedder::PlatformSharedBufferMapping> mapping;
EXPECT_EQ(
MOJO_RESULT_OK,
dispatcher1->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
- static_cast<char*>(mapping->base())[0] = 'x';
+ static_cast<char*>(mapping->GetBase())[0] = 'x';
mapping.reset();
// Duplicate |dispatcher1| and then close it.
@@ -165,7 +165,7 @@ TEST(SharedBufferDispatcher, DuplicateBufferHandle) {
EXPECT_EQ(
MOJO_RESULT_OK,
dispatcher2->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
- EXPECT_EQ('x', static_cast<char*>(mapping->base())[0]);
+ EXPECT_EQ('x', static_cast<char*>(mapping->GetBase())[0]);
EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
}
@@ -250,7 +250,7 @@ TEST(SharedBufferDispatcherTest, MapBufferInvalidArguments) {
SharedBufferDispatcher::Create(
SharedBufferDispatcher::kDefaultCreateOptions, 100, &dispatcher));
- scoped_ptr<RawSharedBufferMapping> mapping;
+ scoped_ptr<embedder::PlatformSharedBufferMapping> mapping;
EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
dispatcher->MapBuffer(0, 101, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
EXPECT_FALSE(mapping);
« no previous file with comments | « mojo/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698