Remove SimpleBroker and instead use the production broker implementation in tests.

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"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/system/broker_state.h"
 #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"
-#include "mojo/edk/system/simple_broker.h"
 
 namespace mojo {
 namespace edk {
 
 // TODO(jam): move into annonymous namespace. Keep outside for debugging in VS
 // temporarily.
 int g_channel_count = 0;
 bool g_wait_for_no_more_channels = false;
 base::TaskRunner* g_delegate_task_runner = nullptr;  // Used at shutdown.
 
@@ skipping 74 matching lines @@
 void ChildProcessLaunched(base::ProcessHandle child_process,
                           ScopedPlatformHandle server_pipe) {
   new ChildBrokerHost(child_process, server_pipe.Pass());
 }
 
 void SetParentPipeHandle(ScopedPlatformHandle pipe) {
   ChildBroker::GetInstance()->SetChildBrokerHostHandle(pipe.Pass());
 }
 
 void Init() {
-  if (!internal::g_broker)
-    internal::g_broker = new SimpleBroker;
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch("use-new-edk") && !internal::g_broker)
+    BrokerState::GetInstance();
 
   DCHECK(!internal::g_platform_support);
   internal::g_platform_support = new SimplePlatformSupport();
 
   DCHECK(!internal::g_core);
   internal::g_core = new Core(internal::g_platform_support);
 }
 
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
@@ skipping 75 matching lines @@
   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