Reinstate wait-for-Initialize when Chrome is run in Mash

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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 40 matching lines @@
 
 void SetParentPipeHandle(ScopedPlatformHandle pipe) {
   CHECK(internal::g_core);
   internal::g_core->InitChild(std::move(pipe));
 }
 
 void SetParentPipeHandleFromCommandLine() {
   ScopedPlatformHandle platform_channel =
       PlatformChannelPair::PassClientHandleFromParentProcess(
           *base::CommandLine::ForCurrentProcess());
-  if (platform_channel.is_valid())
-    SetParentPipeHandle(std::move(platform_channel));
+  CHECK(platform_channel.is_valid());
+  SetParentPipeHandle(std::move(platform_channel));
 }
 
 void Init() {
   internal::g_core = new Core();
 }
 
 MojoResult AsyncWait(MojoHandle handle,
                      MojoHandleSignals signals,
                      const base::Callback<void(MojoResult)>& callback) {
   CHECK(internal::g_core);
@@ skipping 63 matching lines @@
 }
 
 std::string GenerateRandomToken() {
   char random_bytes[16];
   crypto::RandBytes(random_bytes, 16);
   return base::HexEncode(random_bytes, 16);
 }
 
 }  // namespace edk
 }  // namespace mojo