Mojo: RawSharedBuffer::Mapping -> RawSharedBufferMapping.

mojo/system/raw_shared_buffer_posix.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/raw_shared_buffer.h"
 
 #include <stdint.h>
 #include <stdio.h>  // For |fileno()|.
 #include <sys/mman.h>  // For |mmap()|/|munmap()|.
 #include <sys/types.h>  // For |off_t|.
@@ skipping 12 matching lines @@
 #include "mojo/embedder/platform_handle.h"
 
 // We assume that |size_t| and |off_t| (type for |ftruncate()|) fits in a
 // |uint64_t|.
 COMPILE_ASSERT(sizeof(size_t) <= sizeof(uint64_t), size_t_too_big);
 COMPILE_ASSERT(sizeof(off_t) <= sizeof(uint64_t), off_t_too_big);
 
 namespace mojo {
 namespace system {
 
-// RawSharedBuffer::Mapping ----------------------------------------------------
-
-void RawSharedBuffer::Mapping::Unmap() {
-  int result = munmap(real_base_, real_length_);
-  PLOG_IF(ERROR, result != 0) << "munmap";
-}
-
 // RawSharedBuffer -------------------------------------------------------------
 
 bool RawSharedBuffer::InitNoLock() {
   DCHECK(!handle_.is_valid());
 
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   if (static_cast<uint64_t>(num_bytes_) >
           static_cast<uint64_t>(std::numeric_limits<off_t>::max())) {
     return false;
@@ skipping 32 matching lines @@
 
   if (HANDLE_EINTR(ftruncate(fd.get(), static_cast<off_t>(num_bytes_))) != 0) {
     PLOG(ERROR) << "ftruncate";
     return false;
   }
 
   handle_.reset(embedder::PlatformHandle(fd.release()));
   return true;
 }
 
-scoped_ptr<RawSharedBuffer::Mapping> RawSharedBuffer::MapImplNoLock(
+scoped_ptr<RawSharedBufferMapping> RawSharedBuffer::MapImplNoLock(
     size_t offset,
     size_t length) {
   lock_.AssertAcquired();
 
   size_t offset_rounding = offset % base::SysInfo::VMAllocationGranularity();
   size_t real_offset = offset - offset_rounding;
   size_t real_length = length + offset_rounding;
 
   // This should hold (since we checked |num_bytes| versus the maximum value of
   // |off_t| on creation, but it never hurts to be paranoid.
   DCHECK_LE(static_cast<uint64_t>(real_offset),
             static_cast<uint64_t>(std::numeric_limits<off_t>::max()));
 
   void* real_base = mmap(NULL, real_length, PROT_READ | PROT_WRITE, MAP_SHARED,
                          handle_.get().fd, static_cast<off_t>(real_offset));
   // |mmap()| should return |MAP_FAILED| (a.k.a. -1) on error. But it shouldn't
   // return null either.
   if (real_base == MAP_FAILED || !real_base) {
     PLOG(ERROR) << "mmap";
-    return scoped_ptr<Mapping>();
+    return scoped_ptr<RawSharedBufferMapping>();
   }
 
   void* base = static_cast<char*>(real_base) + offset_rounding;
-  return make_scoped_ptr(new Mapping(base, length, real_base, real_length));
+  return make_scoped_ptr(
+      new RawSharedBufferMapping(base, length, real_base, real_length));
+}
+
+// RawSharedBufferMapping ------------------------------------------------------
+
+void RawSharedBufferMapping::Unmap() {
+  int result = munmap(real_base_, real_length_);
+  PLOG_IF(ERROR, result != 0) << "munmap";
 }
 
 }  // namespace system
 }  // namespace mojo