Remove PNaCl's RequestFirstInstall, use resource throttle instead

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 408 matching lines @@
     }
     ReportPpapiError(ERROR_PNACL_CACHE_FETCH_OTHER,
                      pp_error,
                      "Failed to open translated nexe.");
     return;
   }
 
   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 (pnacl) component is not "
-                     "installed. Please consult chrome://components for more "
-                     "information."));
-    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.

[Derek Schuff, 2013/11/01 23:36:28]

the first step is gone, so fix this comment?

[jvoung (off chromium), 2013/11/04 18:16:36]

In the new patch, this second step follows line 524, which still says "first
step".

I'll reorder the functions so that they follow each other in the right order.

   pp::CompletionCallback resources_cb =
       callback_factory_.NewCallback(&PnaclCoordinator::ResourcesDidLoad);
   resources_->StartLoad(resources_cb);
 }
 
 void PnaclCoordinator::ResourcesDidLoad(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::ResourcesDidLoad (pp_error=%"
                  NACL_PRId32 ")\n", pp_error));
   if (pp_error != PP_OK) {
     // Finer-grained error code should have already been reported by
@@ skipping 65 matching lines @@
 
 void PnaclCoordinator::BitcodeStreamDidOpen(int32_t pp_error) {
   if (pp_error != PP_OK) {
     BitcodeStreamDidFinish(pp_error);
     // We have not spun up the translation process yet, so we need to call
     // TranslateFinished here.
     TranslateFinished(pp_error);
     return;
   }
 
-  // Now that we've started the url request for the response headers and
-  // for tickling the component updater's On-Demand API, check that the
-  // compiler is present, or block until it is present or an error is hit.
-  pp::CompletionCallback pnacl_installed_cb =
-      callback_factory_.NewCallback(&PnaclCoordinator::DidCheckPnaclInstalled);
-  plugin_->nacl_interface()->EnsurePnaclInstalled(
-      plugin_->pp_instance(),
-      pnacl_installed_cb.pp_completion_callback());
+  // The component updater's resource throttles + OnDemand update/install
+  // should block the URL request until the compiler is present. Now we
+  // can load the resources (e.g. llc and ld nexes).
+  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::NexeFdDidOpen(int32_t pp_error) {
   PLUGIN_PRINTF(("PnaclCoordinator::NexeFdDidOpen (pp_error=%"
                  NACL_PRId32 ", hit=%d, handle=%d)\n", pp_error,
                  is_cache_hit_ == PP_TRUE,
                  *temp_nexe_file_->existing_handle()));
   if (pp_error < PP_OK) {
     ReportPpapiError(ERROR_PNACL_CREATE_TEMP, pp_error,
                      nacl::string("GetNexeFd failed"));
@@ skipping 151 matching lines @@
                                   obj_file_.get(),
                                   temp_nexe_file_.get(),
                                   &error_info_,
                                   resources_.get(),
                                   &pnacl_options_,
                                   this,
                                   plugin_);
 }
 
 }  // namespace plugin