Plumb through cache_identity from manifest for first sketch of pnacl cache.

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 29 matching lines @@
   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. Sets |pnacl_translate| to |true| if the program is
   // portable bitcode that must be translated.
   virtual bool GetProgramURL(nacl::string* full_url,
+                             nacl::string* cache_identity,
                              ErrorInfo* error_info,
                              bool* pnacl_translate) const;
 
   // Resolves a URL relative to the manifest base URL
   virtual bool ResolveURL(const nacl::string& relative_url,
                           nacl::string* full_url,
                           ErrorInfo* error_info) const;
 
   // 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;
 
   // 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 (via ResolveURL).  |pnacl_translate| tells the caller
   // whether the resolution requires a pnacl translation step.
   // If there was an error, details are reported via error_info.
   virtual bool ResolveKey(const nacl::string& key,
                           nacl::string* full_url,
+                          nacl::string* cache_identity,
                           ErrorInfo* error_info,
                           bool* pnacl_translate) const;
 
  private:
   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_