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 manifest file:
 // {
 //   "program": {
 //     "x86-32": {"url": "myprogram_x86-32.nexe"},
 //     "x86-64": {"url": "myprogram_x86-64.nexe"},
 //     "arm": {"url": "myprogram_arm.nexe"},
 //     "portable": {
 //       "pnacl-translate": {
 //         "url": "myprogram.pexe",
-//         "sha256": "...",
 //         "-O": 0
 //       }
 //     }
 //   },
 //   "interpreter": {
 //     "x86-32": {"url": "interpreter_x86-32.nexe"},
 //     "x86-64": {"url": "interpreter_x86-64.nexe"},
 //     "arm": {"url": "interpreter_arm.nexe"}
 //   },
 //   "files": {
@@ skipping 78 matching lines @@
 // E.g., "container_key" : { "url": "foo.txt" }
 bool IsValidUrlSpec(const Json::Value& url_spec,
                     const nacl::string& container_key,
                     const nacl::string& parent_key,
                     nacl::string* error_string) {
   static const char* kManifestUrlSpecRequired[] = {
     kUrlKey
   };
   static const char* kManifestUrlSpecPlusOptional[] = {
     kUrlKey,
-    kCacheIdentityKey
   };
   if (!IsValidDictionary(url_spec, container_key, parent_key,
                          kManifestUrlSpecPlusOptional,
                          NACL_ARRAY_SIZE(kManifestUrlSpecPlusOptional),
                          kManifestUrlSpecRequired,
                          NACL_ARRAY_SIZE(kManifestUrlSpecRequired),
                          error_string)) {
     return false;
   }
   Json::Value url = url_spec[kUrlKey];
@@ skipping 100 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 262 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, prefer_portable_,
                    full_url, pnacl_options, error_info);
 }
 
 }  // namespace plugin