Pepper: Move PnaclOptions outside trusted plugin.

ppapi/native_client/src/trusted/plugin/manifest.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.
  */
 
 // Manifest interface class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_MANIFEST_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_MANIFEST_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 
+struct PP_PNaClOptions;
+
 namespace pp {
 class URLUtil_Dev;
 }  // namespace pp
 
 namespace plugin {
 
 class ErrorInfo;
-class PnaclOptions;
 
 class Manifest {
  public:
   Manifest() { }
   virtual ~Manifest() { }
 
   // A convention in the interfaces below regarding permit_extension_url:
   // Some manifests (e.g., the pnacl coordinator manifest) need to access
   // resources from an extension origin distinct from the plugin's origin
   // (e.g., the pnacl coordinator needs to load llc, ld, and some libraries).
   // This out-parameter is true if this manifest lookup confers access to
   // a resource in the extension origin.
 
   // Gets the full program URL for the current sandbox ISA from the
   // manifest file.  Fills in |pnacl_options| if the program requires
   // PNaCl translation.
   virtual bool GetProgramURL(nacl::string* full_url,
-                             PnaclOptions* pnacl_options,
+                             PP_PNaClOptions* pnacl_options,
                              bool* uses_nonsfi_mode,
                              ErrorInfo* error_info) const = 0;
 
   // Gets the file names from the "files" section of the manifest.  No
   // checking that the keys' values are proper ISA dictionaries -- it
   // is assumed that other consistency checks take care of that, and
   // that the keys are appropriate for use with ResolveKey.
   virtual bool GetFileKeys(std::set<nacl::string>* keys) const = 0;
 
   // Resolves a key from the "files" section to a fully resolved URL,
   // i.e., relative URL values are fully expanded relative to the
   // manifest's URL.  Fills in |pnacl_options| if
   // the resolved key requires a pnacl translation step to obtain
   // the final requested resource.
   // If there was an error, details are reported via error_info.
   virtual bool ResolveKey(const nacl::string& key,
                           nacl::string* full_url,
-                          PnaclOptions* pnacl_options,
+                          PP_PNaClOptions* pnacl_options,
                           ErrorInfo* error_info) const = 0;
 
  protected:
   NACL_DISALLOW_COPY_AND_ASSIGN(Manifest);
 };
 
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_MANIFEST_H_