Mojo: RawSharedBuffer::Mapping -> RawSharedBufferMapping.

Because the former can't be forward-declared, which leads to
raw_shared_buffer.h being included into just about everything, which
kind of sucks.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/219023010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260760 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 5 deletions

diff --git a/mojo/system/dispatcher.h b/mojo/system/dispatcher.h
index 75d9d42..766a17f 100644
--- a/mojo/system/dispatcher.h
+++ b/mojo/system/dispatcher.h
@@ -15,9 +15,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/c/system/core.h"
-// TODO(vtl): We need this since we can't forward declare
-// |RawSharedBuffer::Mapping|. Maybe fix this.
-#include "mojo/system/raw_shared_buffer.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
@@ -31,6 +28,7 @@ class HandleTable;
 class LocalMessagePipeEndpoint;
 class MessageInTransit;
 class ProxyMessagePipeEndpoint;
+class RawSharedBufferMapping;
 class Waiter;
 
 namespace test {
@@ -107,7 +105,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
   MojoResult MapBuffer(uint64_t offset,
                        uint64_t num_bytes,
                        MojoMapBufferFlags flags,
-                       scoped_ptr<RawSharedBuffer::Mapping>* mapping);
+                       scoped_ptr<RawSharedBufferMapping>* mapping);
 
   // Adds a waiter to this dispatcher. The waiter will be woken up when this
   // object changes state to satisfy |flags| with result |wake_result| (which
@@ -229,7 +227,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Dispatcher :
       uint64_t offset,
       uint64_t num_bytes,
       MojoMapBufferFlags flags,
-      scoped_ptr<RawSharedBuffer::Mapping>* mapping);
+      scoped_ptr<RawSharedBufferMapping>* mapping);
   virtual MojoResult AddWaiterImplNoLock(Waiter* waiter,
                                          MojoWaitFlags flags,
                                          MojoResult wake_result);