NaCl: Merge three global PP_Instance mappings into one

components/nacl/renderer/json_manifest.cc

 // 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.
 
 #include "components/nacl/renderer/json_manifest.h"
 
 #include <set>
 
-#include "base/containers/scoped_ptr_hash_map.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/nacl/renderer/nexe_load_manager.h"
 #include "third_party/jsoncpp/source/include/json/reader.h"
 #include "third_party/jsoncpp/source/include/json/value.h"
 #include "url/gurl.h"
 
 namespace nacl {
 
 namespace {
@@ skipping 352 matching lines @@
     // Currently only allow 0 or 2, since that is what we test.
     if (opt_raw <= 0)
       pnacl_options->opt_level = 0;
     else
       pnacl_options->opt_level = 2;
   }
 }
 
 }  // namespace
 
-typedef base::ScopedPtrHashMap<PP_Instance, nacl::JsonManifest> JsonManifestMap;
-base::LazyInstance<JsonManifestMap> g_manifest_map = LAZY_INSTANCE_INITIALIZER;
-
-void AddJsonManifest(PP_Instance instance, scoped_ptr<JsonManifest> manifest) {
-  g_manifest_map.Get().add(instance, manifest.Pass());
-}
-
-JsonManifest* GetJsonManifest(PP_Instance instance) {
-  return g_manifest_map.Get().get(instance);
-}
-
-void DeleteJsonManifest(PP_Instance instance) {
-  g_manifest_map.Get().erase(instance);
-}
-
 JsonManifest::JsonManifest(const std::string& manifest_base_url,
                            const std::string& sandbox_isa,
                            bool nonsfi_enabled,
                            bool pnacl_debug)
     : manifest_base_url_(manifest_base_url),
       sandbox_isa_(sandbox_isa),
       nonsfi_enabled_(nonsfi_enabled),
       pnacl_debug_(pnacl_debug) { }
 
 bool JsonManifest::Init(const std::string& manifest_json,
@@ skipping 254 matching lines @@
   } else {
     // NaCl
     *url = isa_spec[kUrlKey].asString();
     pnacl_options->translate = PP_FALSE;
   }
 
   return true;
 }
 
 }  // namespace nacl