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

components/nacl/renderer/plugin/srpc_client.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.
  */
 
 // A representation of an SRPC connection.  These can be either to the
 // service runtime or to untrusted NaCl threads.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_CLIENT_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_CLIENT_H_
+#ifndef COMPONENTS_NACL_RENDERER_PLUGIN_SRPC_CLIENT_H_
+#define COMPONENTS_NACL_RENDERER_PLUGIN_SRPC_CLIENT_H_
 
 #include <map>
 #include <string>
 
+#include "components/nacl/renderer/plugin/utility.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
-#include "ppapi/native_client/src/trusted/plugin/utility.h"
 
 namespace nacl {
 class DescWrapper;
 }  // namespace nacl
 
 namespace plugin {
 
 class ErrorInfo;
 class MethodInfo;
 class Plugin;
@@ skipping 29 matching lines @@
   void GetMethods();
   typedef std::map<std::string, MethodInfo*> Methods;
   Methods methods_;
   NaClSrpcChannel srpc_channel_;
   bool srpc_channel_initialised_;
   NaClSrpcError last_error_;
 };
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_CLIENT_H_
+#endif  // COMPONENTS_NACL_RENDERER_PLUGIN_SRPC_CLIENT_H_