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

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

 // Copyright (c) 2012 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 "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h"
 
 #include <utility>
 #include <vector>
 
 #include "native_client/src/include/checked_cast.h"
@@ skipping 223 matching lines @@
                            pnacl_options,
                            translate_notify_callback);
   coordinator->pnacl_init_time_ = NaClGetTimeOfDayMicroseconds();
   coordinator->off_the_record_ =
       plugin->nacl_interface()->IsOffTheRecord();
   PLUGIN_PRINTF(("PnaclCoordinator::BitcodeToNative (manifest=%p, "
                  "off_the_record=%d)\n",
                  reinterpret_cast<const void*>(coordinator->manifest_.get()),
                  coordinator->off_the_record_));
 
-  // Loading resources (e.g. llc and ld nexes) is done with PnaclResources.
-  coordinator->resources_.reset(
-      new PnaclResources(plugin,
-                         coordinator,
-                         coordinator->manifest_.get()));
-  CHECK(coordinator->resources_ != NULL);
-
-  // The first step of loading resources: read the resource info file.
-  pp::CompletionCallback resource_info_read_cb =
+  // First check that PNaCl is installed.
+  pp::CompletionCallback pnacl_installed_cb =
       coordinator->callback_factory_.NewCallback(
-          &PnaclCoordinator::ResourceInfoWasRead);
-  coordinator->resources_->ReadResourceInfo(PnaclUrls::GetResourceInfoUrl(),
-                                            resource_info_read_cb);
+          &PnaclCoordinator::DidCheckPnaclInstalled);
+  plugin->nacl_interface()->EnsurePnaclInstalled(
+      plugin->pp_instance(),
+      pnacl_installed_cb.pp_completion_callback());
   return coordinator;
 }
 
 PnaclCoordinator::PnaclCoordinator(
     Plugin* plugin,
     const nacl::string& pexe_url,
     const PnaclOptions& pnacl_options,
     const pp::CompletionCallback& translate_notify_callback)
   : translate_finish_error_(PP_OK),
     plugin_(plugin),
@@ skipping 390 matching lines @@
 
   // Transfer ownership of cache/temp file's wrapper to the coordinator.
   if (cached_nexe_file_ != NULL) {
     translated_fd_.reset(cached_nexe_file_->release_read_wrapper());
   } else {
     translated_fd_.reset(temp_nexe_file_->release_read_wrapper());
   }
   translate_notify_callback_.Run(pp_error);
 }
 
+void PnaclCoordinator::DidCheckPnaclInstalled(int32_t pp_error) {
+  if (pp_error != PP_OK) {
+    ReportNonPpapiError(
+        ERROR_PNACL_RESOURCE_FETCH,
+        nacl::string("The Portable Native Client component is not installed"
+                     " or has been disabled."));
+    return;
+  }
+
+  // Loading resources (e.g. llc and ld nexes) is done with PnaclResources.
+  resources_.reset(new PnaclResources(plugin_,
+                                      this,
+                                      this->manifest_.get()));
+  CHECK(resources_ != NULL);
+
+  // The first step of loading resources: read the resource info file.
+  pp::CompletionCallback resource_info_read_cb =
+      callback_factory_.NewCallback(
+          &PnaclCoordinator::ResourceInfoWasRead);
+  resources_->ReadResourceInfo(PnaclUrls::GetResourceInfoUrl(),
+                               resource_info_read_cb);
+}
+
 void PnaclCoordinator::ResourceInfoWasRead(int32_t pp_error) {
   PLUGIN_PRINTF(("PluginCoordinator::ResourceInfoWasRead (pp_error=%"
                 NACL_PRId32 ")\n", pp_error));
   // Second step of loading resources: call StartLoad.
   pp::CompletionCallback resources_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourcesDidLoad);
   resources_->StartLoad(resources_cb);
 }
 
 void PnaclCoordinator::ResourcesDidLoad(int32_t pp_error) {
@@ skipping 384 matching lines @@
                                   obj_file_.get(),
                                   temp_nexe_file_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin