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

mojo/edk/test/multiprocess_test_helper.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_TEST_MULTIPROCESS_TEST_HELPER_H_
 #define MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_
 
 #include <string>
 
 #include "base/process/process.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace mojo {
 
 namespace edk {
 class PlatformChannelPair;
 
 namespace test {
 
+extern const char kBrokerHandleSwitch[];
+
 class MultiprocessTestHelper {
  public:
   MultiprocessTestHelper();
   ~MultiprocessTestHelper();
 
   // Start a child process and run the "main" function "named" |test_child_name|
   // declared using |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| or
   // |MOJO_MULTIPROCESS_TEST_CHILD_TEST()| (below).
   void StartChild(const std::string& test_child_name);
   // Like |StartChild()|, but appends an extra switch (with ASCII value) to the
@@ skipping 19 matching lines @@
   // For use by |MOJO_MULTIPROCESS_TEST_CHILD_MAIN()| only:
   static void ChildSetup();
 
   // For use in the main process:
   ScopedPlatformHandle server_platform_handle;
 
   // For use (and only valid) in the child process:
   static ScopedPlatformHandle client_platform_handle;
 
  private:
+  // Used differently depending on the test.
   scoped_ptr<PlatformChannelPair> platform_channel_pair_;
 
+  // Used by the broker.
+  scoped_ptr<PlatformChannelPair> broker_platform_channel_pair_;
+
   // Valid after |StartChild()| and before |WaitForChildShutdown()|.
   base::Process test_child_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MultiprocessTestHelper);
 };
 
 // Use this to declare the child process's "main()" function for tests using
 // |MultiprocessTestHelper|. It returns an |int|, which will be the process's
 // exit code (but see the comment about |WaitForChildShutdown()|).
 #define MOJO_MULTIPROCESS_TEST_CHILD_MAIN(test_child_name) \
@@ skipping 14 matching lines @@
                ? 1                                         \
                : 0;                                        \
   }                                                        \
   void test_child_name##TestChildTest()
 
 }  // namespace test
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_TEST_MULTIPROCESS_TEST_HELPER_H_