NaCl cleanup: Move ppb_nacl_private.h into components/nacl/renderer/

components/nacl/renderer/ppb_nacl_private.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.
- */
+// 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.
 
-/* From private/ppb_nacl_private.idl modified Sun Feb  8 11:33:30 2015. */
-
-#ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
-#define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
+#ifndef COMPONENTS_NACL_RENDERER_PPB_NACL_PRIVATE_H_
+#define COMPONENTS_NACL_RENDERER_PPB_NACL_PRIVATE_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/c/private/pp_file_handle.h"
+#include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppp_pexe_stream_handler.h"
 
-#define PPB_NACL_PRIVATE_INTERFACE_1_0 "PPB_NaCl_Private;1.0"
-#define PPB_NACL_PRIVATE_INTERFACE PPB_NACL_PRIVATE_INTERFACE_1_0
+// This file defines an interface that is used by the code in
+// components/nacl/renderer/plugin/.  It is defined as a PPAPI PPB_*
+// interface for historical reasons: The code in plugin/ used to live
+// outside the Chromium repo.
+//
+// In the future, we may integrate the code in nacl/renderer/plugin/ more
+// closely with nacl/renderer/.  This could include having plugin/ call the
+// functions below directly, rather than providing these functions via the
+// PPB_NaCl_Private interface struct.
 
-/**
- * @file
- * This file contains NaCl private interfaces. This interface is not versioned
- * and is for internal Chrome use. It may change without notice. */
-
-
-#include "ppapi/c/private/pp_file_handle.h"
-#include "ppapi/c/private/ppb_instance_private.h"
+#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl_Private"
 
 /**
  * @addtogroup Enums
  * @{
  */
 /** NaCl-specific errors that should be reported to the user.
  *  These error codes are reported via UMA so, if you edit them:
  *   1) make sure you understand UMA first.
  *   2) update src/tools/metrics/histograms/histograms.xml
  *  Values are explicitly specified to make sure they don't shift around when
@@ skipping 158 matching lines @@
   uint64_t token_hi;
 };
 /**
  * @}
  */
 
 /**
  * @addtogroup Interfaces
  * @{
  */
-/* PPB_NaCl_Private */
-struct PPB_NaCl_Private_1_0 {
+struct PPB_NaCl_Private {
   /* Launches NaCl's sel_ldr process.  Returns PP_EXTERNAL_PLUGIN_OK on success
    * and writes a NaClHandle to imc_handle. Returns PP_EXTERNAL_PLUGIN_FAILED on
    * failure.
    * The |nexe_file_info| is currently used only in non-SFI mode. It is the
    * file handle for the main nexe file, which should be initially loaded.
    * LaunchSelLdr takes the ownership of the file handle.
    * The |uses_nonsfi_mode| flag indicates whether or not nonsfi-mode should
    * be used with the binary pointed by the url.
    */
   void (*LaunchSelLdr)(PP_Instance instance,
@@ skipping 126 matching lines @@
    * Otherwise, |stream_callback| is called repeatedly with blocks of data
    * as they are received. |stream_finished_callback| is called after all
    * data has been received and dispatched to |stream_callback|.
    */
   void (*StreamPexe)(PP_Instance instance,
                      const char* pexe_url,
                      int32_t opt_level,
                      const struct PPP_PexeStreamHandler_1_0* stream_handler,
                      void* stream_handler_user_data);
 };
-
-typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */