Rename mojo::TokenSerializer to mojo::Broker.

mojo/runner/host/child_process.cc

Index: mojo/runner/host/child_process.cc
diff --git a/mojo/runner/host/child_process.cc b/mojo/runner/host/child_process.cc
index 7c157b68827d7ae4ab6e5089faa63c8ada0c60d8..659b508ca1645819f87de01905dc24f9b8679c5f 100644
--- a/mojo/runner/host/child_process.cc
+++ b/mojo/runner/host/child_process.cc
@@ -108,10 +108,7 @@ class AppContext : public embedder::ProcessDelegate {
   ~AppContext() override {}
 
   void Init() {
-#if defined(OS_WIN)
     embedder::PreInitializeChildProcess();
-#endif
-
     // Initialize Mojo before starting any threads.
     embedder::Init();
 
@@ -315,24 +312,34 @@ ScopedMessagePipeHandle InitializeHostMessagePipe(
     // platform handle to setup the communication channel by which we exchange
     // handles to/from tokens, which is needed for sandboxed Windows
     // processes.
-    char token_serializer_handle[10];
+    char broker_handle[10];
     MojoHandleSignalsState state;
     MojoResult rv =
         MojoWait(host_message_pipe.get().value(), MOJO_HANDLE_SIGNAL_READABLE,
                  MOJO_DEADLINE_INDEFINITE, &state);
     CHECK_EQ(MOJO_RESULT_OK, rv);
-    uint32_t num_bytes = arraysize(token_serializer_handle);
+    uint32_t num_bytes = arraysize(broker_handle);
     rv = MojoReadMessage(host_message_pipe.get().value(),
-                         token_serializer_handle, &num_bytes, nullptr, 0,
+                         broker_handle, &num_bytes, nullptr, 0,
                          MOJO_READ_MESSAGE_FLAG_NONE);
     CHECK_EQ(MOJO_RESULT_OK, rv);
 
-    edk::ScopedPlatformHandle token_serializer_channel =
+    edk::ScopedPlatformHandle broker_channel =
         edk::PlatformChannelPair::PassClientHandleFromParentProcessFromString(
-            std::string(token_serializer_handle, num_bytes));
-    CHECK(token_serializer_channel.is_valid());
-    embedder::SetParentPipeHandle(token_serializer_channel.release().handle);
+            std::string(broker_handle, num_bytes));
+    CHECK(broker_channel.is_valid());
+    embedder::SetParentPipeHandle(
+        mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
+            broker_channel.release().
+#if defined(OS_WIN)

[yzshen1, 2015/11/25 16:47:09]

Does it make sense to have helper methods (in either class) to convert between
edk::ScopedPlatformHandle and mojo::embedder::ScopedPlatformHandle? That way we
don't have to do this in multiple places.

Besides, is it possible to change |handle| and |fd| to the same name, say
|value|? I don't see the benefit of having different names on different
platforms. :/

[jam, 2015/11/25 16:56:09]

I thought of that; but the goal should be to delete the old edk soon and so
that's why i was ok with this extra code.
I agree! Although I think it should be done outside this change.

+                                    handle
+#else
+                                    fd
+#endif
+            )));
   }
+#else
+  // TODO(jam): hook up on POSIX
 #endif
 
   return host_message_pipe.Pass();