Mojo: RawSharedBuffer::Mapping -> RawSharedBufferMapping.

mojo/system/shared_buffer_dispatcher_unittest.cc

 // 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.
 
 #include "mojo/system/shared_buffer_dispatcher.h"
 
 #include <limits>
 
 #include "base/memory/ref_counted.h"
 #include "mojo/system/dispatcher.h"
@@ skipping 83 matching lines @@
                                                     &validated_options));
 
   scoped_refptr<SharedBufferDispatcher> dispatcher;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(validated_options, 100,
                                            &dispatcher));
   ASSERT_TRUE(dispatcher);
   EXPECT_EQ(Dispatcher::kTypeSharedBuffer, dispatcher->GetType());
 
   // Make a couple of mappings.
-  scoped_ptr<RawSharedBuffer::Mapping> mapping1;
+  scoped_ptr<RawSharedBufferMapping> 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());
   // Write something.
   static_cast<char*>(mapping1->base())[50] = 'x';
 
-  scoped_ptr<RawSharedBuffer::Mapping> mapping2;
+  scoped_ptr<RawSharedBufferMapping> 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]);
 
   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]);
 }
 
 TEST(SharedBufferDispatcher, DuplicateBufferHandle) {
   MojoCreateSharedBufferOptions validated_options = { 0 };
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::ValidateOptions(NULL,
                                                     &validated_options));
 
   scoped_refptr<SharedBufferDispatcher> dispatcher1;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(validated_options, 100,
                                            &dispatcher1));
 
   // Map and write something.
-  scoped_ptr<RawSharedBuffer::Mapping> mapping;
+  scoped_ptr<RawSharedBufferMapping> mapping;
   EXPECT_EQ(MOJO_RESULT_OK,
             dispatcher1->MapBuffer(0, 100, MOJO_MAP_BUFFER_FLAG_NONE,
                                    &mapping));
   static_cast<char*>(mapping->base())[0] = 'x';
   mapping.reset();
 
   // Duplicate |dispatcher1| and then close it.
   scoped_refptr<Dispatcher> dispatcher2;
   EXPECT_EQ(MOJO_RESULT_OK,
             dispatcher1->DuplicateBufferHandle(NULL, &dispatcher2));
@@ skipping 37 matching lines @@
   MojoCreateSharedBufferOptions validated_options = { 0 };
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::ValidateOptions(NULL,
                                                     &validated_options));
 
   scoped_refptr<SharedBufferDispatcher> dispatcher;
   EXPECT_EQ(MOJO_RESULT_OK,
             SharedBufferDispatcher::Create(validated_options, 100,
                                            &dispatcher));
 
-  scoped_ptr<RawSharedBuffer::Mapping> mapping;
+  scoped_ptr<RawSharedBufferMapping> mapping;
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher->MapBuffer(0, 101, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher->MapBuffer(1, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher->MapBuffer(0, 0, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
 }
 
 // TODO(vtl): Test |DuplicateBufferHandle()| with invalid |options|.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo