Make mojo::system::Core not own the PlatformSupport.

mojo/edk/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_EDK_SYSTEM_CORE_H_
 #define MOJO_EDK_SYSTEM_CORE_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
@@ skipping 21 matching lines @@
 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):
-  explicit Core(scoped_ptr<embedder::PlatformSupport> platform_support);
+
+  // |*platform_support| must outlive this object.
+  explicit Core(embedder::PlatformSupport* platform_support);
   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);
 
   // Watches on the given handle for the given signals, calling |callback| when
   // a signal is satisfied or when all signals become unsatisfiable. |callback|
   // must satisfy stringent requirements -- see |Awakable::Awake()| in
   // awakable.h. In particular, it must not call any Mojo system functions.
   MojoResult AsyncWait(MojoHandle handle,
                        MojoHandleSignals signals,
                        base::Callback<void(MojoResult)> callback);
 
   embedder::PlatformSupport* platform_support() const {
-    return platform_support_.get();
+    return platform_support_;
   }
 
   // ---------------------------------------------------------------------------
 
   // The following methods are essentially implementations of the Mojo Core
   // functions of the Mojo API, with the C interface translated to C++ by
   // "mojo/edk/embedder/entrypoints.cc". The best way to understand the contract
   // of these methods is to look at the header files defining the corresponding
   // API functions, referenced below.
 
@@ skipping 82 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_;
+  embedder::PlatformSupport* const 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_EDK_SYSTEM_CORE_H_