Mojo: Make Core own a PlatformSupport, and plumb it through to Channel.

mojo/system/core.h

 // Copyright 2013 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.
 
 #ifndef MOJO_SYSTEM_CORE_H_
 #define MOJO_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/system/handle_table.h"
 #include "mojo/system/mapping_table.h"
 #include "mojo/system/memory.h"
 #include "mojo/system/system_impl_export.h"
 
 namespace mojo {
+
+namespace embedder {
+class PlatformSupport;
+}
+
 namespace system {
 
 class Dispatcher;
 struct HandleSignalsState;
 
 // |Core| is an object that implements the Mojo system calls. All public methods
 // are thread-safe.
 class MOJO_SYSTEM_IMPL_EXPORT Core {
  public:
-  // These methods are only to be used by via the embedder API (and internally).
+  // ---------------------------------------------------------------------------
+
+  // These methods are only to be used by via the embedder API (and internally):
   Core();
   virtual ~Core();
 
   // Adds |dispatcher| to the handle table, returning the handle for it. Returns
   // |MOJO_HANDLE_INVALID| on failure, namely if the handle table is full.
   MojoHandle AddDispatcher(const scoped_refptr<Dispatcher>& dispatcher);
 
   // Looks up the dispatcher for the given handle. Returns null if the handle is
   // invalid.
   scoped_refptr<Dispatcher> GetDispatcher(MojoHandle handle);
 
-  // System calls implementation.
+  embedder::PlatformSupport* platform_support() const {
+    return platform_support_.get();
+  }
+
+  // ---------------------------------------------------------------------------
+
+  // System calls implementation:
   MojoTimeTicks GetTimeTicksNow();
   MojoResult Close(MojoHandle handle);
   MojoResult Wait(MojoHandle handle,
                   MojoHandleSignals signals,
                   MojoDeadline deadline,
                   UserPointer<MojoHandleSignalsState> signals_state);
   MojoResult WaitMany(UserPointer<const MojoHandle> handles,
                       UserPointer<const MojoHandleSignals> signals,
                       uint32_t num_handles,
                       MojoDeadline deadline,
@@ skipping 61 matching lines @@
   // validation of arguments. |*result_index| is only set if the result (whether
   // success or failure) applies to a specific handle, so its value should be
   // preinitialized to |static_cast<uint32_t>(-1)|.
   MojoResult WaitManyInternal(const MojoHandle* handles,
                               const MojoHandleSignals* signals,
                               uint32_t num_handles,
                               MojoDeadline deadline,
                               uint32_t* result_index,
                               HandleSignalsState* signals_states);
 
-  // ---------------------------------------------------------------------------
+  const scoped_ptr<embedder::PlatformSupport> platform_support_;
 
   // TODO(vtl): |handle_table_lock_| should be a reader-writer lock (if only we
   // had them).
   base::Lock handle_table_lock_;  // Protects |handle_table_|.
   HandleTable handle_table_;
 
   base::Lock mapping_table_lock_;  // Protects |mapping_table_|.
   MappingTable mapping_table_;
 
-  // ---------------------------------------------------------------------------
-
   DISALLOW_COPY_AND_ASSIGN(Core);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_CORE_H_