Replace early check for PNaCl with an on-demand check.

chrome/browser/nacl_host/nacl_file_host.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/browser/nacl_host/nacl_file_host.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/nacl_host/nacl_browser.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/manifest_handlers/shared_module_info.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "ipc/ipc_platform_file.h"
@@ skipping 27 matching lines @@
                                        &error_code);
   if (error_code != base::PLATFORM_FILE_OK) {
     return false;
   }
   return true;
 }
 
 void DoOpenPnaclFile(
     scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter,
     const std::string& filename,
+    IPC::Message* reply_msg);
+
+void PnaclCheckDone(
+    scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter,
+    const std::string& filename,
+    IPC::Message* reply_msg,
+    bool success) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (!success) {
+    NotifyRendererOfError(chrome_render_message_filter, reply_msg);
+  } else {
+    if (!BrowserThread::PostBlockingPoolTask(
+            FROM_HERE,
+            base::Bind(&DoOpenPnaclFile,
+                       chrome_render_message_filter,
+                       filename,
+                       reply_msg))) {
+      NotifyRendererOfError(chrome_render_message_filter, reply_msg);
+    }
+  }
+}
+
+void TryInstallPnacl(
+    scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter,
+    const std::string& filename,
+    IPC::Message* reply_msg) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  ComponentUpdateService* cus = g_browser_process->component_updater();
+  PnaclComponentInstaller* pci =
+      g_browser_process->pnacl_component_installer();
+  RequestFirstInstall(cus,
+                      pci,
+                      base::Bind(&PnaclCheckDone,
+                                 chrome_render_message_filter,
+                                 filename,
+                                 reply_msg));
+}
+
+void DoOpenPnaclFile(
+    scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter,
+    const std::string& filename,
     IPC::Message* reply_msg) {
   DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   base::FilePath full_filepath;
 
+  // PNaCl must be installed.
+  base::FilePath pnacl_dir;
+  if (!PathService::Get(chrome::DIR_PNACL_COMPONENT, &pnacl_dir) ||
+      !file_util::PathExists(pnacl_dir)) {
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&TryInstallPnacl,
+                   chrome_render_message_filter,
+                   filename,
+                   reply_msg));
+    return;
+  }
+
   // Do some validation.
   if (!nacl_file_host::PnaclCanOpenFile(filename, &full_filepath)) {
     NotifyRendererOfError(chrome_render_message_filter.get(), reply_msg);
     return;
   }
 
   base::PlatformFile file_to_open;
   if (!PnaclDoOpenFile(full_filepath, &file_to_open)) {
     NotifyRendererOfError(chrome_render_message_filter.get(), reply_msg);
     return;
@@ skipping 265 matching lines @@
       base::Bind(
           &DoOpenNaClExecutableOnThreadPool,
           chrome_render_message_filter,
           extension_info_map,
           file_url, reply_msg))) {
     NotifyRendererOfError(chrome_render_message_filter.get(), reply_msg);
   }
 }
 
 }  // namespace nacl_file_host