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

components/nacl/renderer/plugin/service_runtime.h

 /* -*- c++ -*- */
 /*
  * 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 class containing information regarding a socket connection to a
 // service runtime instance.
 
-#ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
-#define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
+#ifndef COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_
+#define COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_
 
+#include "components/nacl/renderer/plugin/utility.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/public/imc_types.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
-
 #include "ppapi/cpp/completion_callback.h"
-#include "ppapi/native_client/src/trusted/plugin/utility.h"
 
 struct NaClFileInfo;
 
 namespace plugin {
 
 class ErrorInfo;
 class Plugin;
 class SelLdrLauncherChrome;
 class SrpcClient;
 class ServiceRuntime;
@@ skipping 85 matching lines @@
   bool start_sel_ldr_done_;
   bool sel_ldr_wait_timed_out_;
   bool start_nexe_done_;
   bool nexe_started_ok_;
 
   NaClHandle bootstrap_channel_;
 };
 
 }  // namespace plugin
 
-#endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
+#endif  // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_