Make mojo_system static and mojo_system_impl a component, never use both

mojo/embedder/embedder_unittest.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/embedder/embedder.h"
 
 #include <string.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 93 matching lines @@
  protected:
   system::test::TestIOThread* test_io_thread() { return &test_io_thread_; }
 
  private:
   system::test::TestIOThread test_io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderTest);
 };
 
 TEST_F(EmbedderTest, ChannelsBasic) {
-  Init();
-
   {
     PlatformChannelPair channel_pair;
     ScopedTestChannel server_channel(test_io_thread()->task_runner(),
                                      channel_pair.PassServerHandle());
     MojoHandle server_mp = server_channel.bootstrap_message_pipe();
     EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
     ScopedTestChannel client_channel(test_io_thread()->task_runner(),
                                      channel_pair.PassClientHandle());
     MojoHandle client_mp = client_channel.bootstrap_message_pipe();
     EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
@@ skipping 27 matching lines @@
     server_channel.WaitForChannelCreationCompletion();
     client_channel.WaitForChannelCreationCompletion();
     EXPECT_TRUE(server_channel.channel_info() != NULL);
     EXPECT_TRUE(client_channel.channel_info() != NULL);
   }
 
   EXPECT_TRUE(test::Shutdown());
 }
 
 TEST_F(EmbedderTest, ChannelsHandlePassing) {
-  Init();
-
   {
     PlatformChannelPair channel_pair;
     ScopedTestChannel server_channel(test_io_thread()->task_runner(),
                                      channel_pair.PassServerHandle());
     MojoHandle server_mp = server_channel.bootstrap_message_pipe();
     EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
     ScopedTestChannel client_channel(test_io_thread()->task_runner(),
                                      channel_pair.PassClientHandle());
     MojoHandle client_mp = client_channel.bootstrap_message_pipe();
     EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
@@ skipping 113 matching lines @@
 //   4.  "Bar"+mp1
 //   5.  (close)
 //   6.              (close)
 //   7.                                                              "baz"
 //   8.                                                              (closed)
 //   9.                                      "quux"+mp2
 //  10.                          (close)
 //  11.                                      (wait/cl.)
 //  12.                                                  (wait/cl.)
 TEST_F(EmbedderTest, MultiprocessChannels) {
-  Init();
   mojo::test::MultiprocessTestHelper multiprocess_test_helper;
   multiprocess_test_helper.StartChild("MultiprocessChannelsClient");
 
   {
     ScopedTestChannel server_channel(
         test_io_thread()->task_runner(),
         multiprocess_test_helper.server_platform_handle.Pass());
     MojoHandle server_mp = server_channel.bootstrap_message_pipe();
     EXPECT_NE(server_mp, MOJO_HANDLE_INVALID);
     server_channel.WaitForChannelCreationCompletion();
@@ skipping 88 matching lines @@
   EXPECT_TRUE(test::Shutdown());
 }
 
 MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) {
   embedder::ScopedPlatformHandle client_platform_handle =
       mojo::test::MultiprocessTestHelper::client_platform_handle.Pass();
   EXPECT_TRUE(client_platform_handle.is_valid());
 
   system::test::TestIOThread
       test_io_thread(system::test::TestIOThread::kAutoStart);
-  Init();
 
   {
     ScopedTestChannel client_channel(test_io_thread.task_runner(),
                                      client_platform_handle.Pass());
     MojoHandle client_mp = client_channel.bootstrap_message_pipe();
     EXPECT_NE(client_mp, MOJO_HANDLE_INVALID);
     client_channel.WaitForChannelCreationCompletion();
     CHECK(client_channel.channel_info() != NULL);
 
     // 1. Read the first message from |client_mp|.
@@ skipping 83 matching lines @@
 
   EXPECT_TRUE(test::Shutdown());
 }
 
 // TODO(vtl): Test immediate write & close.
 // TODO(vtl): Test broken-connection cases.
 
 }  // namespace
 }  // namespace embedder
 }  // namespace mojo