Split pnacl and nacl mime types

ppapi/native_client/src/trusted/plugin/json_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 processing for JSON manifests.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_
@@ skipping 13 matching lines @@
 
 namespace plugin {
 
 class ErrorInfo;
 class PnaclOptions;
 
 class JsonManifest : public Manifest {
  public:
   JsonManifest(const pp::URLUtil_Dev* url_util,
            const nacl::string& manifest_base_url,
-           const nacl::string& sandbox_isa,
-           bool prefer_portable)
+           const nacl::string& sandbox_isa)
       : url_util_(url_util),
         manifest_base_url_(manifest_base_url),
         sandbox_isa_(sandbox_isa),
-        prefer_portable_(prefer_portable),
         dictionary_(Json::nullValue) { }
   virtual ~JsonManifest() { }
 
   // Initialize the manifest object for use by later lookups.  The return
   // value is true if the manifest parses correctly and matches the schema.
   bool Init(const nacl::string& json, ErrorInfo* error_info);
 
   // Gets the full program URL for the current sandbox ISA from the
   // manifest file.
   virtual bool GetProgramURL(nacl::string* full_url,
@@ skipping 24 matching lines @@
   NACL_DISALLOW_COPY_AND_ASSIGN(JsonManifest);
 
   // Checks that |dictionary_| is a valid manifest, according to the schema.
   // Returns true on success, and sets |error_info| to a detailed message
   // if not.
   bool MatchesSchema(ErrorInfo* error_info);
 
   const pp::URLUtil_Dev* url_util_;
   nacl::string manifest_base_url_;
   nacl::string sandbox_isa_;
-  // Determines whether portable programs are chosen in manifest files over
-  // native programs.
-  bool prefer_portable_;
 
   Json::Value dictionary_;
 };
 
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_