PNaCl on-demand installs: Make a separate async IPC to check if PNaCl is installed

chrome/renderer/pepper/pnacl_translation_resource_host.h

Index: chrome/renderer/pepper/pnacl_translation_resource_host.h
diff --git a/chrome/renderer/pepper/pnacl_translation_resource_host.h b/chrome/renderer/pepper/pnacl_translation_resource_host.h
index 271b27d6b113013d8423e53166de1ee72e18f751..9f1a2040fc2ad00019d2a1887611694ec00fa92c 100644
--- a/chrome/renderer/pepper/pnacl_translation_resource_host.h
+++ b/chrome/renderer/pepper/pnacl_translation_resource_host.h
@@ -6,13 +6,17 @@
 #define CHROME_RENDERER_PEPPER_PNACL_TRANSLATION_RESOURCE_HOST_H_
 
 #include <map>
+#include <vector>
 
-#include "components/nacl/common/pnacl_types.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 
+namespace nacl {
+struct PnaclCacheInfo;
+}
+
 // A class to keep track of requests made to the browser for resources that the
 // PNaCl translator needs (e.g. descriptors for the translator nexes, temp
 // files, and cached translations).
@@ -31,6 +35,10 @@ class PnaclTranslationResourceHost : public IPC::ChannelProxy::MessageFilter {
                      scoped_refptr<ppapi::TrackedCallback> callback);
   void ReportTranslationFinished(PP_Instance instance);
 
+  // Ensure that PNaCl resources (pnacl-llc.nexe, linker, libs) are installed.
+  void EnsurePnaclInstalled(PP_Instance instance,
+                            scoped_refptr<ppapi::TrackedCallback> callback);
+
  protected:
   virtual ~PnaclTranslationResourceHost();
 
@@ -51,23 +59,38 @@ class PnaclTranslationResourceHost : public IPC::ChannelProxy::MessageFilter {
   // Maps the instance with an outstanding cache request to the info
   // about that request.
   typedef std::map<PP_Instance, CacheRequestInfo> CacheRequestInfoMap;
+  // A list of outstanding EnsurePnaclInstalled requests.
+  typedef std::vector<scoped_refptr<ppapi::TrackedCallback> >
+      EnsurePnaclInstalledList;
   // IPC::ChannelProxy::MessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
   virtual void OnFilterRemoved() OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
+  void SendRequestNexeFd(int render_view_id,
+                         PP_Instance instance,
+                         const nacl::PnaclCacheInfo& cache_info,
+                         PP_Bool* is_hit,
+                         PP_FileHandle* file_handle,
+                         scoped_refptr<ppapi::TrackedCallback> callback);
+  void SendReportTranslationFinished(PP_Instance instance);
+  void SendEnsurePnaclInstalled(PP_Instance instance,
+                                scoped_refptr<ppapi::TrackedCallback> callback);
+
   void OnNexeTempFileReply(PP_Instance instance,
                            bool is_hit,
                            IPC::PlatformFileForTransit file);
   void CleanupCacheRequests();
+  void OnEnsurePnaclInstalledReply(PP_Instance instance, bool success);
+  void CleanupEnsurePnaclRequests();
 
   scoped_refptr<base::MessageLoopProxy> io_message_loop_;
-  IPC::Channel* channel_;
 
   // Should be accessed on the io thread.
+  IPC::Channel* channel_;
   CacheRequestInfoMap pending_cache_requests_;
-
+  EnsurePnaclInstalledList pending_ensure_pnacl_requests_;
   DISALLOW_COPY_AND_ASSIGN(PnaclTranslationResourceHost);
 };