NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/

components/nacl/renderer/plugin/nacl_subprocess.h

 // Copyright (c) 2012 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.
 
 // Instances of NaCl modules spun up within the plugin as a subprocess.
 // This may represent the "main" nacl module, or it may represent helpers
 // that perform various tasks within the plugin, for example,
 // a NaCl module for a compiler could be loaded to translate LLVM bitcode
 // into native code.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_SUBPROCESS_H_

[jvoung (off chromium), 2015/01/28 22:18:17]

Should the include guards be changed at some point too?

[Mark Seaborn, 2015/01/29 05:35:06]

Thanks for catching that.  Fixed.

 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_SUBPROCESS_H_
 
 #include <stdarg.h>
 
+#include "components/nacl/renderer/plugin/service_runtime.h"
+#include "components/nacl/renderer/plugin/srpc_client.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/portability.h"
 
-#include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
-#include "ppapi/native_client/src/trusted/plugin/srpc_client.h"
-
 namespace plugin {
 
 class Plugin;
 class ServiceRuntime;
 class SrpcParams;
 
 
 // A class representing an instance of a NaCl module, loaded by the plugin.
 class NaClSubprocess {
  public:
@@ skipping 45 matching lines @@
 
   // The service runtime representing the NaCl module instance.
   nacl::scoped_ptr<ServiceRuntime> service_runtime_;
   // Ownership of srpc_client taken from the service runtime.
   nacl::scoped_ptr<SrpcClient> srpc_client_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_NACL_SUBPROCESS_H_