Revert of NaCl: Remove reliance on "init_done" SRPC call in the non-PNaCl case

ppapi/nacl_irt/ppapi_dispatcher.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 "ppapi/nacl_irt/ppapi_dispatcher.h"
 
 #include <map>
 #include <set>
 
 #include "build/build_config.h"
@@ skipping 164 matching lines @@
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
 
   proxy::PluginGlobals::Get()->set_keepalive_throttle_interval_milliseconds(
       args.keepalive_throttle_interval_milliseconds);
 
   // Tell the process-global GetInterface which interfaces it can return to the
   // plugin.
   proxy::InterfaceList::SetProcessGlobalPermissions(args.permissions);
 
-  // Notify the renderer process, if necessary.
-  ManifestService* manifest_service = GetManifestService();
-  if (manifest_service)
-    manifest_service->StartupInitializationComplete();
-
   int32_t error = ::PPP_InitializeModule(
       0 /* module */,
       &proxy::PluginDispatcher::GetBrowserInterface);
   if (error)
     ::exit(error);
 
   proxy::PluginDispatcher* dispatcher =
       new proxy::PluginDispatcher(::PPP_GetInterface, args.permissions,
                                   args.off_the_record);
   IPC::ChannelHandle channel_handle(
       "nacl",
       base::FileDescriptor(renderer_ipc_fd_, false));
   if (!dispatcher->InitPluginWithChannel(this, base::kNullProcessId,
                                          channel_handle, false)) {
     delete dispatcher;
     return;
   }
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
+
+  // Notify the renderer process, if necessary.
+  ManifestService* manifest_service = GetManifestService();
+  if (manifest_service)
+    manifest_service->StartupInitializationComplete();
 }
 
 void PpapiDispatcher::OnPluginDispatcherMessageReceived(
     const IPC::Message& msg) {
   // The first parameter should be a plugin dispatcher ID.
   PickleIterator iter(msg);
   uint32 id = 0;
   if (!iter.ReadUInt32(&id)) {
     NOTREACHED();
     return;
   }
   std::map<uint32, proxy::PluginDispatcher*>::iterator dispatcher =
       plugin_dispatchers_.find(id);
   if (dispatcher != plugin_dispatchers_.end())
     dispatcher->second->OnMessageReceived(msg);
 }
 
 }  // namespace ppapi