Fix mojo::embedder::CreateChannel().

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/atomicops.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 109 matching lines @@
 
 ScopedMessagePipeHandle CreateChannel(
     ScopedPlatformHandle platform_handle,
     scoped_refptr<base::TaskRunner> io_thread_task_runner,
     DidCreateChannelCallback callback,
     scoped_refptr<base::TaskRunner> callback_thread_task_runner) {
   DCHECK(platform_handle.is_valid());
   DCHECK(io_thread_task_runner);
   DCHECK(!callback.is_null());
 
-  scoped_ptr<ChannelInfo> channel_info(new ChannelInfo(MakeChannelId()));
+  system::ChannelId channel_id = MakeChannelId();
+  scoped_ptr<ChannelInfo> channel_info(new ChannelInfo(channel_id));
   scoped_refptr<system::MessagePipeDispatcher> dispatcher =
       internal::g_channel_manager->CreateChannel(
-          channel_info->channel_id, platform_handle.Pass(),
-          io_thread_task_runner,
+          channel_id, platform_handle.Pass(), io_thread_task_runner,
           base::Bind(callback, base::Unretained(channel_info.release())),
           callback_thread_task_runner);
 
   ScopedMessagePipeHandle rv(
       MessagePipeHandle(internal::g_core->AddDispatcher(dispatcher)));
   CHECK(rv.is_valid());
   return rv;
 }
 
 // TODO(vtl): Write tests for this.
@@ skipping 54 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