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

chrome/renderer/pepper/pnacl_translation_resource_host.cc

 // Copyright 2013 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 "pnacl_translation_resource_host.h"
 
 #ifndef DISABLE_NACL
 #include "chrome/common/nacl_host_messages.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 
 using ppapi::TrackedCallback;
 using ppapi::PpapiGlobals;
 
 PnaclTranslationResourceHost::CacheRequestInfo::CacheRequestInfo(
     PP_Bool* hit,
     PP_FileHandle* handle,
     scoped_refptr<TrackedCallback> cb)
     : is_hit(hit), file_handle(handle), callback(cb) {}
 
 PnaclTranslationResourceHost::CacheRequestInfo::~CacheRequestInfo() {}
 
 PnaclTranslationResourceHost::PnaclTranslationResourceHost(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
     : io_message_loop_(io_message_loop), channel_(NULL) {}
 
 PnaclTranslationResourceHost::~PnaclTranslationResourceHost() {
   CleanupCacheRequests();
+  CleanupEnsurePnaclRequests();
 }
 
 void PnaclTranslationResourceHost::OnFilterAdded(IPC::Channel* channel) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   channel_ = channel;
 }
 
 void PnaclTranslationResourceHost::OnFilterRemoved() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   channel_ = NULL;
 }
 
 void PnaclTranslationResourceHost::OnChannelClosing() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   channel_ = NULL;
 }
 
 bool PnaclTranslationResourceHost::OnMessageReceived(
     const IPC::Message& message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PnaclTranslationResourceHost, message)
     IPC_MESSAGE_HANDLER(NaClViewMsg_NexeTempFileReply, OnNexeTempFileReply)
+    IPC_MESSAGE_HANDLER(NaClViewMsg_EnsurePnaclInstalledReply,
+                        OnEnsurePnaclInstalledReply)
+    IPC_MESSAGE_HANDLER(NaClViewMsg_EnsurePnaclInstalledProgress,
+                        OnEnsurePnaclInstalledProgress)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PnaclTranslationResourceHost::RequestNexeFd(
     int render_view_id,
     PP_Instance instance,
     const nacl::PnaclCacheInfo& cache_info,
     PP_Bool* is_hit,
@@ skipping 75 matching lines @@
 
 void PnaclTranslationResourceHost::CleanupCacheRequests() {
   for (CacheRequestInfoMap::iterator it = pending_cache_requests_.begin();
        it != pending_cache_requests_.end();
        ++it) {
     it->second.callback->PostAbort();
   }
   pending_cache_requests_.clear();
 }
 
+
+
+void PnaclTranslationResourceHost::EnsurePnaclInstalled(
+    PP_Instance instance,
+    scoped_refptr<TrackedCallback> callback) {
+  if (!io_message_loop_->BelongsToCurrentThread()) {
+    io_message_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(&PnaclTranslationResourceHost::EnsurePnaclInstalled,
+                   this, instance, callback));
+    return;
+  }
+  if (!channel_ || !channel_->Send(new NaClHostMsg_EnsurePnaclInstalled(
+          instance))) {
+    PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
+        FROM_HERE,
+        base::Bind(&TrackedCallback::Run,
+                   callback,
+                   static_cast<int32_t>(PP_ERROR_FAILED)));
+    return;
+  }
+  pending_ensure_pnacl_requests_.insert(
+      std::make_pair(instance, callback));
+}
+
+void PnaclTranslationResourceHost::OnEnsurePnaclInstalledReply(
+    PP_Instance instance,
+    bool success) {
+  EnsurePnaclInstalledMap::iterator it =
+      pending_ensure_pnacl_requests_.find(instance);
+  if (it == pending_ensure_pnacl_requests_.end()) {
+    DLOG(ERROR) << "Could not find pending request for reply";
+  } else {
+    if (TrackedCallback::IsPending(it->second)) {
+      PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
+          FROM_HERE,
+          base::Bind(&TrackedCallback::Run,
+                     it->second,
+                     static_cast<int32_t>(success ? PP_OK : PP_ERROR_FAILED)));
+    }
+    pending_ensure_pnacl_requests_.erase(it);
+  }
+}
+
+void PnaclTranslationResourceHost::OnEnsurePnaclInstalledProgress(
+    PP_Instance instance,
+    int64_t current_progress,
+    int64_t total) {
+  // TODO(jvoung): Issue a progress event w/ dmichael's new DispatchEvent
+  // interface: https://codereview.chromium.org/14588009/
+}
+
+void PnaclTranslationResourceHost::CleanupEnsurePnaclRequests() {
+  for (EnsurePnaclInstalledMap::iterator it =
+           pending_ensure_pnacl_requests_.begin();
+       it != pending_ensure_pnacl_requests_.end();
+       ++it) {
+    it->second->PostAbort();
+  }
+  pending_ensure_pnacl_requests_.clear();
+}
+
 #endif  // DISABLE_NACL