Use HTTP response headers for PNaCl caching instead of bitcode hash.

ppapi/native_client/src/trusted/plugin/json_manifest.cc

 /*
  * 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.
  */
 
 #include <algorithm>
 
 #include "native_client/src/trusted/plugin/json_manifest.h"
 
@@ skipping 23 matching lines @@
 const char* const kX8632Key =       "x86-32";
 const char* const kX8664Key =       "x86-64";
 const char* const kArmKey =         "arm";
 const char* const kPortableKey =    "portable";
 
 // Url Resolution keys
 const char* const kPnaclTranslateKey = "pnacl-translate";
 const char* const kUrlKey =            "url";
 
 // Pnacl keys
-const char* const kCacheIdentityKey = "sha256";
 const char* const kOptLevelKey = "-O";
 const char* const kPnaclExperimentalFlags = "experimental_flags";
 
 // Sample NaCL manifest file:
 // {
 //   "program": {
 //     "x86-32": {"url": "myprogram_x86-32.nexe"},
 //     "x86-64": {"url": "myprogram_x86-64.nexe"},
 //     "arm": {"url": "myprogram_arm.nexe"}
 //   },
@@ skipping 15 matching lines @@
 //     }
 //   }
 // }
 
 // Sample PNaCl manifest file:
 // {
 //   "program": {
 //     "portable": {
 //       "pnacl-translate": {
 //         "url": "myprogram.pexe",
-//         "sha256": "...",
 //         "-O": 0
 //       }
 //     }
 //   },
 //   "files": {
 //     "foo.txt": {
 //       "portable": {"url": "foo.txt"}
 //     },
 //     "bar.txt": {
 //       "portable": {"url": "bar.txt"}
@@ skipping 71 matching lines @@
                     const nacl::string& sandbox_isa,
                     nacl::string* error_string) {
   static const char* kManifestUrlSpecRequired[] = {
     kUrlKey
   };
   const char** urlSpecPlusOptional;
   size_t urlSpecPlusOptionalLength;
   if (sandbox_isa == kPortableKey) {
     static const char* kPnaclUrlSpecPlusOptional[] = {
       kUrlKey,
-      kCacheIdentityKey,
       kOptLevelKey,
     };
     urlSpecPlusOptional = kPnaclUrlSpecPlusOptional;
     urlSpecPlusOptionalLength = NACL_ARRAY_SIZE(kPnaclUrlSpecPlusOptional);
   } else {
     urlSpecPlusOptional = kManifestUrlSpecRequired;
     urlSpecPlusOptionalLength = NACL_ARRAY_SIZE(kManifestUrlSpecRequired);
   }
   if (!IsValidDictionary(url_spec, container_key, parent_key,
                          urlSpecPlusOptional,
@@ skipping 16 matching lines @@
   // Verify the correct types of the fields if they exist.
   Json::Value url = url_spec[kUrlKey];
   if (!url.isString()) {
     nacl::stringstream error_stream;
     error_stream << parent_key << " property '" << container_key <<
         "' has non-string value '" << url.toStyledString() <<
         "' for key '" << kUrlKey << "'.";
     *error_string = error_stream.str();
     return false;
   }
-  Json::Value cache_identity = url_spec[kCacheIdentityKey];
-  if (!cache_identity.empty() && !cache_identity.isString()) {
-    nacl::stringstream error_stream;
-    error_stream << parent_key << " property '" << container_key <<
-        "' has non-string value '" << cache_identity.toStyledString() <<
-        "' for key '" << kCacheIdentityKey << "'.";
-    *error_string = error_stream.str();
-    return false;
-  }
   Json::Value opt_level = url_spec[kOptLevelKey];
   if (!opt_level.empty() && !opt_level.isNumeric()) {
     nacl::stringstream error_stream;
     error_stream << parent_key << " property '" << container_key <<
         "' has non-numeric value '" << opt_level.toStyledString() <<
         "' for key '" << kOptLevelKey << "'.";
     *error_string = error_stream.str();
     return false;
   }
   return true;
@@ skipping 140 matching lines @@
     }
   }
 
   return true;
 }
 
 void GrabUrlAndPnaclOptions(const Json::Value& url_spec,
                             nacl::string* url,
                             PnaclOptions* pnacl_options) {
   *url = url_spec[kUrlKey].asString();
-  if (url_spec.isMember(kCacheIdentityKey)) {
-    pnacl_options->set_bitcode_hash(url_spec[kCacheIdentityKey].asString());
-  }
   if (url_spec.isMember(kOptLevelKey)) {
     uint32_t opt_raw = url_spec[kOptLevelKey].asUInt();
     // Clamp the opt value to fit into an int8_t.
     if (opt_raw > 3)
       opt_raw = 3;
     pnacl_options->set_opt_level(static_cast<int8_t>(opt_raw));
   }
   if (url_spec.isMember(kPnaclExperimentalFlags)) {
     pnacl_options->set_experimental_flags(
         url_spec[kPnaclExperimentalFlags].asString());
@@ skipping 274 matching lines @@
     error_info->SetReport(
         ERROR_MANIFEST_RESOLVE_URL,
         nacl::string("ResolveKey: no such \"files\" entry: ") + key);
     return false;
   }
   return GetKeyUrl(files, rest, sandbox_isa_, this, full_url, pnacl_options,
                    error_info);
 }
 
 }  // namespace plugin