NaCl: Merge three global PP_Instance mappings into one

components/nacl/renderer/json_manifest.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
 #define COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H
 
 #include <set>
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_array_output.h"
-#include "ppapi/c/pp_instance.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 
 namespace nacl {
 class JsonManifest;
 class NexeLoadManager;
 
-// There is at most one JsonManifest per PP_Instance. This adds a one-to-one
-// mapping.
-void AddJsonManifest(PP_Instance instance, scoped_ptr<JsonManifest> manifest);
-
-// Returns a non-owning pointer to the JsonManifest for the given instance.
-// Returns NULL if no such JsonManifest exists.
-JsonManifest* GetJsonManifest(PP_Instance instance);
-void DeleteJsonManifest(PP_Instance instance);
-
 class JsonManifest {
  public:
   struct ErrorInfo {
     PP_NaClError error;
     std::string string;
   };
 
   JsonManifest(const std::string& manifest_base_url,
                const std::string& sandbox_isa,
                bool nonsfi_enabled,
@@ skipping 36 matching lines @@
   bool nonsfi_enabled_;
   bool pnacl_debug_;
 
   // The dictionary of manifest information parsed in Init().
   Json::Value dictionary_;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_RENDERER_JSON_MANIFEST_H