| Index: mojo/system/raw_shared_buffer.cc
 | 
| diff --git a/mojo/system/raw_shared_buffer.cc b/mojo/system/raw_shared_buffer.cc
 | 
| index a4bd4a6ddd360f0517813a9bf56871bbf4af2369..fb67cca71a77e8cfb3ddee8f13c7c3fbc50a45ec 100644
 | 
| --- a/mojo/system/raw_shared_buffer.cc
 | 
| +++ b/mojo/system/raw_shared_buffer.cc
 | 
| @@ -21,10 +21,10 @@ RawSharedBuffer* RawSharedBuffer::Create(size_t num_bytes) {
 | 
|    return rv;
 | 
|  }
 | 
|  
 | 
| -scoped_ptr<RawSharedBuffer::Mapping> RawSharedBuffer::Map(size_t offset,
 | 
| -                                                          size_t length) {
 | 
| +scoped_ptr<RawSharedBufferMapping> RawSharedBuffer::Map(size_t offset,
 | 
| +                                                        size_t length) {
 | 
|    if (!IsValidMap(offset, length))
 | 
| -    return scoped_ptr<Mapping>();
 | 
| +    return scoped_ptr<RawSharedBufferMapping>();
 | 
|  
 | 
|    return MapNoCheck(offset, length);
 | 
|  }
 | 
| @@ -41,9 +41,8 @@ bool RawSharedBuffer::IsValidMap(size_t offset, size_t length) {
 | 
|    return true;
 | 
|  }
 | 
|  
 | 
| -scoped_ptr<RawSharedBuffer::Mapping> RawSharedBuffer::MapNoCheck(
 | 
| -    size_t offset,
 | 
| -    size_t length) {
 | 
| +scoped_ptr<RawSharedBufferMapping> RawSharedBuffer::MapNoCheck(size_t offset,
 | 
| +                                                               size_t length) {
 | 
|    DCHECK(IsValidMap(offset, length));
 | 
|  
 | 
|    base::AutoLock locker(lock_);
 | 
| 
 |