NaCl plugin: Make ServiceRuntime::Shutdown() kill the NaCl loader

components/nacl/renderer/nexe_load_manager.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 "components/nacl/renderer/nexe_load_manager.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 277 matching lines @@
 void NexeLoadManager::set_trusted_plugin_channel(
     std::unique_ptr<TrustedPluginChannel> channel) {
   trusted_plugin_channel_ = std::move(channel);
 }
 
 void NexeLoadManager::set_manifest_service_channel(
     std::unique_ptr<ManifestServiceChannel> channel) {
   manifest_service_channel_ = std::move(channel);
 }
 
+void NexeLoadManager::close_trusted_plugin_channel() {
+  trusted_plugin_channel_.reset();
+}
+
 PP_NaClReadyState NexeLoadManager::nacl_ready_state() {
   return nacl_ready_state_;
 }
 
 void NexeLoadManager::set_nacl_ready_state(PP_NaClReadyState ready_state) {
   nacl_ready_state_ = ready_state;
   ppapi::ScopedPPVar ready_state_name(
       ppapi::ScopedPPVar::PassRef(),
       ppapi::StringVar::StringToPPVar("readyState"));
   SetReadOnlyProperty(ready_state_name.get(), PP_MakeInt32(ready_state));
@@ skipping 132 matching lines @@
   // to provide error handling.
 }
 
 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) {
   base::StringTokenizer t(crash_log, "\n");
   while (t.GetNext())
     LogToConsole(t.token());
 }
 
 }  // namespace nacl