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

mojo/edk/embedder/embedder.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/edk/embedder/embedder.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 namespace {
 
 // Helper for |CreateChannel...()|. Returns 0 on failure. Called on the channel
 // creation thread.
 system::ChannelId MakeChannel(
     ScopedPlatformHandle platform_handle,
     scoped_refptr<system::ChannelEndpoint> channel_endpoint) {
   DCHECK(platform_handle.is_valid());
 
   // Create and initialize a |system::Channel|.
-  DCHECK(internal::g_core);
+  DCHECK(internal::g_platform_support);
   scoped_refptr<system::Channel> channel =
-      new system::Channel(internal::g_core->platform_support());
+      new system::Channel(internal::g_platform_support);
   channel->Init(system::RawChannel::Create(platform_handle.Pass()));
   channel->SetBootstrapEndpoint(channel_endpoint);
 
   // You can use any nonzero, unique (in the set of |Channel|s managed by the
   // given |ChannelManager|) value as ID. So here we just use the address of the
   // channel.
   system::ChannelId id = static_cast<system::ChannelId>(
       reinterpret_cast<uintptr_t>(channel.get()));
   DCHECK(internal::g_channel_manager);
   internal::g_channel_manager->AddChannel(id, channel,
@@ skipping 18 matching lines @@
   } else {
     callback.Run(channel_info.release());
   }
 }
 
 }  // namespace
 
 namespace internal {
 
 // Declared in embedder_internal.h.
+PlatformSupport* g_platform_support = nullptr;
 system::Core* g_core = nullptr;
 system::ChannelManager* g_channel_manager = nullptr;
 
 }  // namespace internal
 
 void Init(scoped_ptr<PlatformSupport> platform_support) {
+  DCHECK(platform_support);
+
+  DCHECK(!internal::g_platform_support);
+  internal::g_platform_support = platform_support.release();
+
   DCHECK(!internal::g_core);
-  internal::g_core = new system::Core(platform_support.Pass());
+  internal::g_core = new system::Core(internal::g_platform_support);
+
   DCHECK(!internal::g_channel_manager);
   internal::g_channel_manager = new system::ChannelManager();
 }
 
 Configuration* GetConfiguration() {
   return system::GetMutableConfiguration();
 }
 
 // TODO(vtl): Write tests for this.
 ScopedMessagePipeHandle CreateChannelOnIOThread(
@@ skipping 109 matching lines @@
 }
 
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
                      base::Callback<void(MojoResult)> callback) {
   return internal::g_core->AsyncWait(handle, signals, callback);
 }
 
 }  // namespace embedder
 }  // namespace mojo