NaCl PPAPI Proxy: wrap up with crash detection. Clean-up handling code to skip remote shutdown ca...

ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc

 // Copyright (c) 2011 The Native Client 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 "native_client/src/shared/ppapi_proxy/browser_ppp.h"
 
 #include <string.h>
 
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/portability.h"
@@ skipping 107 matching lines @@
   return PP_OK;
 }
 
 void BrowserPpp::ShutdownModule() {
   DebugPrintf("PPP_Shutdown: main_channel=%p\n",
               static_cast<void*>(main_channel_));
   if (main_channel_ == NULL) {
     CHECK(!is_nexe_alive_);
     return;  // The proxy has already been shut down.
   }
-  NaClSrpcError srpc_result =
-    PppRpcClient::PPP_ShutdownModule(main_channel_);
-  DebugPrintf("PPP_ShutdownModule: %s\n", NaClSrpcErrorString(srpc_result));
+  if (is_nexe_alive_) {
+    NaClSrpcError srpc_result =
+      PppRpcClient::PPP_ShutdownModule(main_channel_);
+    DebugPrintf("PPP_ShutdownModule: %s\n", NaClSrpcErrorString(srpc_result));
+  }
   NaClThreadJoin(&upcall_thread_);
   UnsetBrowserPppForInstance(plugin_->pp_instance());
   UnsetModuleIdForSrpcChannel(main_channel_);
   UnsetInstanceIdForSrpcChannel(main_channel_);
   main_channel_ = NULL;
   is_nexe_alive_ = false;
-  DebugPrintf("PPP_Shutdown: done\n");
+  DebugPrintf("PPP_Shutdown: main_channel=NULL\n");
 }
 
 const void* BrowserPpp::GetPluginInterface(const char* interface_name) {
   DebugPrintf("PPP_GetInterface('%s')\n", interface_name);
   if (!is_valid())
     return NULL;
   int32_t exports_interface_name;
   NaClSrpcError srpc_result =
       PppRpcClient::PPP_GetInterface(main_channel_,
                                      const_cast<char*>(interface_name),
@@ skipping 40 matching lines @@
 
 const void* BrowserPpp::GetPluginInterfaceSafe(const char* interface_name) {
   const void* ppp_interface = GetPluginInterface(interface_name);
   if (ppp_interface == NULL)
     DebugPrintf("PPB_GetInterface: %s not found\n", interface_name);
   CHECK(ppp_interface != NULL);
   return ppp_interface;
 }
 
 }  // namespace ppapi_proxy