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

chrome/renderer/pepper/ppb_nacl_private_impl.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 "chrome/renderer/pepper/ppb_nacl_private_impl.h"
 
 #ifndef DISABLE_NACL
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 23 matching lines @@
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace {
 
 base::LazyInstance<scoped_refptr<PnaclTranslationResourceHost> >
     g_pnacl_resource_host = LAZY_INSTANCE_INITIALIZER;
 
 static bool InitializePnaclResourceHost() {
+  // Must run on the main thread.
+  content::RenderThread* render_thread = content::RenderThread::Get();
+  if (!render_thread)
+    return false;
   if (!g_pnacl_resource_host.Get()) {
-    content::RenderThread* render_thread = content::RenderThread::Get();
-    if (!render_thread)
-      return false;
     g_pnacl_resource_host.Get() = new PnaclTranslationResourceHost(
         render_thread->GetIOMessageLoopProxy());
     render_thread->AddFilter(g_pnacl_resource_host.Get());
   }
   return true;
 }
 
 struct InstanceInfo {
   InstanceInfo() : plugin_pid(base::kNullProcessId), plugin_child_id(0) {}
   GURL url;
@@ skipping 136 matching lines @@
                               uint32_t options) {
 #if defined(OS_WIN)
   return content::BrokerDuplicateHandle(source_handle, process_id,
                                         target_handle, desired_access,
                                         options);
 #else
   return 0;
 #endif
 }
 
+int32_t EnsurePnaclInstalled(PP_Instance instance,
+                             PP_CompletionCallback callback) {
+  ppapi::thunk::EnterInstance enter(instance, callback);
+  if (enter.failed())
+    return enter.retval();
+  if (!InitializePnaclResourceHost())
+    return enter.SetResult(PP_ERROR_FAILED);
+  g_pnacl_resource_host.Get()->EnsurePnaclInstalled(
+      instance,
+      enter.callback());
+  return enter.SetResult(PP_OK_COMPLETIONPENDING);
+}
+
 PP_FileHandle GetReadonlyPnaclFD(const char* filename) {
   IPC::PlatformFileForTransit out_fd = IPC::InvalidPlatformFileForTransit();
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
   if (!sender->Send(new NaClHostMsg_GetReadonlyPnaclFD(
           std::string(filename),
           &out_fd))) {
     return base::kInvalidPlatformFileValue;
   }
-
   if (out_fd == IPC::InvalidPlatformFileForTransit()) {
     return base::kInvalidPlatformFileValue;
   }
-
   base::PlatformFile handle =
       IPC::PlatformFileForTransitToPlatformFile(out_fd);
   return handle;
 }
 
 PP_FileHandle CreateTemporaryFile(PP_Instance instance) {
   IPC::PlatformFileForTransit transit_fd = IPC::InvalidPlatformFileForTransit();
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
   if (!sender->Send(new NaClHostMsg_NaClCreateTemporaryFile(
@@ skipping 20 matching lines @@
                   PP_FileHandle* handle,
                   struct PP_CompletionCallback callback) {
   ppapi::thunk::EnterInstance enter(instance, callback);
   if (enter.failed())
     return enter.retval();
   if (!pexe_url || !last_modified || !etag || !is_hit || !handle)
     return enter.SetResult(PP_ERROR_BADARGUMENT);
   if (!InitializePnaclResourceHost())
     return enter.SetResult(PP_ERROR_FAILED);
 
-  IPC::Sender* sender = content::RenderThread::Get();
-  DCHECK(sender);
   base::Time last_modified_time;
   // If FromString fails, it doesn't touch last_modified_time and we just send
   // the default-constructed null value.
   base::Time::FromString(last_modified, &last_modified_time);
 
   nacl::PnaclCacheInfo cache_info;
   cache_info.pexe_url = GURL(pexe_url);
   cache_info.abi_version = abi_version;
   cache_info.opt_level = opt_level;
   cache_info.last_modified = last_modified_time;
@@ skipping 69 matching lines @@
       IPC::PlatformFileForTransitToPlatformFile(out_fd);
   return handle;
 }
 
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
   &UrandomFD,
   &Are3DInterfacesDisabled,
   &BrokerDuplicateHandle,
+  &EnsurePnaclInstalled,
   &GetReadonlyPnaclFD,
   &CreateTemporaryFile,
   &GetNexeFd,
   &ReportTranslationFinished,
   &IsOffTheRecord,
   &IsPnaclEnabled,
   &ReportNaClError,
   &OpenNaClExecutable
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
   return &nacl_interface;
 }
 
 #endif  // DISABLE_NACL