Revert 205329 "Split pnacl and nacl mime types"

trunk/src/ppapi/native_client/src/trusted/plugin/json_manifest.h

Index: trunk/src/ppapi/native_client/src/trusted/plugin/json_manifest.h
===================================================================
--- trunk/src/ppapi/native_client/src/trusted/plugin/json_manifest.h	(revision 205338)
+++ trunk/src/ppapi/native_client/src/trusted/plugin/json_manifest.h	(working copy)
@@ -31,10 +31,12 @@
  public:
   JsonManifest(const pp::URLUtil_Dev* url_util,
            const nacl::string& manifest_base_url,
-           const nacl::string& sandbox_isa)
+           const nacl::string& sandbox_isa,
+           bool prefer_portable)
       : url_util_(url_util),
         manifest_base_url_(manifest_base_url),
         sandbox_isa_(sandbox_isa),
+        prefer_portable_(prefer_portable),
         dictionary_(Json::nullValue) { }
   virtual ~JsonManifest() { }
 
@@ -79,6 +81,9 @@
   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_;
 };