Remove PNaCl's RequestFirstInstall, use resource throttle instead

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/nacl_host/nacl_host_message_filter.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/common/nacl_browser_delegate.h"
 #include "components/nacl/common/nacl_host_messages.h"
-#include "components/nacl/common/pnacl_types.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"
 
 using content::BrowserThread;
 
 namespace {
 
 // Force a prefix to prevent user from opening "magic" files.
 const char* kExpectedFilePrefix = "pnacl_public_";
 
 // Restrict PNaCl file lengths to reduce likelyhood of hitting bugs
 // in file name limit error-handling-code-paths, etc.
 const size_t kMaxFileLength = 40;
 
 void NotifyRendererOfError(
     NaClHostMessageFilter* nacl_host_message_filter,
     IPC::Message* reply_msg) {
   reply_msg->set_reply_error();
   nacl_host_message_filter->Send(reply_msg);
 }
 
-void TryInstallPnacl(
-    const nacl_file_host::InstallCallback& done_callback,
-    const nacl_file_host::InstallProgressCallback& progress_callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // TODO(jvoung): Figure out a way to get progress events and
-  // call progress_callback.
-  nacl::NaClBrowser::GetDelegate()->TryInstallPnacl(done_callback);
-}
-
-void DoEnsurePnaclInstalled(
-    const nacl_file_host::InstallCallback& done_callback,
-    const nacl_file_host::InstallProgressCallback& progress_callback) {
-  DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-  // If already installed, return reply w/ success immediately.
-  base::FilePath pnacl_dir;
-  if (nacl::NaClBrowser::GetDelegate()->GetPnaclDirectory(&pnacl_dir)
-      && !pnacl_dir.empty()
-      && base::PathExists(pnacl_dir)) {
-    done_callback.Run(true);
-    return;
-  }
-
-  // Otherwise, request an install (but send some "unknown" progress first).
-  progress_callback.Run(nacl::PnaclInstallProgress::Unknown());
-  // TryInstall after sending the progress event so that they are more ordered.
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&TryInstallPnacl, done_callback, progress_callback));
-}
-
 bool PnaclDoOpenFile(const base::FilePath& file_to_open,
                      base::PlatformFile* out_file) {
   base::PlatformFileError error_code;
   *out_file = base::CreatePlatformFile(file_to_open,
                                        base::PLATFORM_FILE_OPEN |
                                        base::PLATFORM_FILE_READ,
                                        NULL,
                                        &error_code);
   if (error_code != base::PLATFORM_FILE_OK) {
     return false;
@@ skipping 96 matching lines @@
   } else {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
     return;
   }
 }
 
 }  // namespace
 
 namespace nacl_file_host {
 
-void EnsurePnaclInstalled(
-    const InstallCallback& done_callback,
-    const InstallProgressCallback& progress_callback) {
-  if (!BrowserThread::PostBlockingPoolTask(
-          FROM_HERE,
-          base::Bind(&DoEnsurePnaclInstalled,
-                     done_callback,
-                     progress_callback))) {
-    done_callback.Run(false);
-  }
-}
-
 void GetReadonlyPnaclFd(
     scoped_refptr<NaClHostMessageFilter> nacl_host_message_filter,
     const std::string& filename,
     IPC::Message* reply_msg) {
   if (!BrowserThread::PostBlockingPoolTask(
           FROM_HERE,
           base::Bind(&DoOpenPnaclFile,
                      nacl_host_message_filter,
                      filename,
                      reply_msg))) {
@@ skipping 73 matching lines @@
       FROM_HERE,
       base::Bind(
           &DoOpenNaClExecutableOnThreadPool,
           nacl_host_message_filter,
           file_url, reply_msg))) {
     NotifyRendererOfError(nacl_host_message_filter.get(), reply_msg);
   }
 }
 
 }  // namespace nacl_file_host