Prepare chrome to use the new Mojo EDK by default.

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/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "mojo/edk/system/child_broker.h"
 #include "mojo/edk/system/child_broker_host.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 
 namespace mojo {
 namespace edk {
 
-namespace {
-
-// Note: Called on the I/O thread.
-void ShutdownIPCSupportHelper() {
-}
-
-}  // namespace
-
 namespace internal {
 
 // Declared in embedder_internal.h.
 Broker* g_broker = nullptr;
 PlatformSupport* g_platform_support = nullptr;
 Core* g_core = nullptr;
 
 ProcessDelegate* g_process_delegate;
 base::TaskRunner* g_io_thread_task_runner = nullptr;
 
@@ skipping 94 matching lines @@
   // |Init()| must have already been called.
   DCHECK(internal::g_core);
   internal::g_process_delegate = process_delegate;
   internal::g_io_thread_task_runner = io_thread_task_runner.get();
 }
 
 void ShutdownIPCSupportOnIOThread() {
 }
 
 void ShutdownIPCSupport() {
-  internal::g_io_thread_task_runner->PostTaskAndReply(
-      FROM_HERE,
-      base::Bind(&ShutdownIPCSupportHelper),
-      base::Bind(&ProcessDelegate::OnShutdownComplete,
-                 base::Unretained(internal::g_process_delegate)));
+  // TODO(jam): remove ProcessDelegate from new EDK once the old EDK is gone.
+  internal::g_process_delegate->OnShutdownComplete();
 }
 
 ScopedMessagePipeHandle CreateMessagePipe(
     ScopedPlatformHandle platform_handle) {
   MojoCreateMessagePipeOptions options = {
       static_cast<uint32_t>(sizeof(MojoCreateMessagePipeOptions)),
       MOJO_CREATE_MESSAGE_PIPE_OPTIONS_FLAG_TRANSFERABLE};
   scoped_refptr<MessagePipeDispatcher> dispatcher =
       MessagePipeDispatcher::Create(options);
 
   ScopedMessagePipeHandle rv(
       MessagePipeHandle(internal::g_core->AddDispatcher(dispatcher)));
   CHECK(rv.is_valid());
   dispatcher->Init(platform_handle.Pass(), nullptr, 0, nullptr, 0, nullptr,
                    nullptr);
   // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it
   // once that's fixed.
   return rv.Pass();
 }
 
 }  // namespace edk
 }  // namespace mojo