Pepper: Move JsonManifestMap to json_manifest.h

components/nacl/renderer/json_manifest.h

Index: components/nacl/renderer/json_manifest.h
diff --git a/components/nacl/renderer/json_manifest.h b/components/nacl/renderer/json_manifest.h
index d8885d36990f2f781680fe7867b861dc28e8607e..7fdb1ab9e18d1af97f8ce2c9dddb892bd622b7d4 100644
--- a/components/nacl/renderer/json_manifest.h
+++ b/components/nacl/renderer/json_manifest.h
@@ -8,13 +8,25 @@
 #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);

[dmichael (off chromium), 2014/06/03 17:46:17]

Arguably these could be static members, and you could drop JsonManifest from the
names. I feel like that's a more common style in Chromium.

I take it the lifetime of NexeLoadManager isn't quite right for just making each
NexeLoadManager own a JsonManifest?

+
 class JsonManifest {
  public:
   struct ErrorInfo {