Move command line processing out of coordinator

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

Index: ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
===================================================================
--- ppapi/native_client/src/trusted/plugin/pnacl_resources.cc	(revision 114029)
+++ ppapi/native_client/src/trusted/plugin/pnacl_resources.cc	(working copy)
@@ -32,10 +32,6 @@
   resource_wrappers_.clear();
 }
 
-void PnaclResources::Initialize() {
-  callback_factory_.Initialize(this);
-}
-
 void PnaclResources::AddResourceUrl(const nacl::string& url) {
   // Use previously loaded resources if available.
   if (resource_wrappers_.find(url) != resource_wrappers_.end()) {
@@ -60,27 +56,23 @@
   delayed_callback_.reset(

[robertm, 2011/12/13 17:06:39]

not sure whether the DelayedCallback adds all this much value in this case.

[sehr (please use chromium), 2011/12/13 20:05:04]

It is needed to implement the barrier callback for multiple resources.

       new DelayedCallback(all_loaded_callback, resource_count));
 
-  // All resource URLs are relative to the coordinator's resource_base_url().
-  nacl::string resource_base_url = coordinator_->resource_base_url();
-
   // Schedule the downloads.
   CHECK(resource_urls_.size() > 0);
   for (size_t i = 0; i < resource_urls_.size(); ++i) {
-    const nacl::string& full_url = resource_base_url + resource_urls_[i];
+    const nacl::string& full_url = resource_base_url_ + resource_urls_[i];
+    PLUGIN_PRINTF(("PnaclResources::StartDownloads === creating callback\n"));
     pp::CompletionCallback ready_callback =
         callback_factory_.NewCallback(&PnaclResources::ResourceReady,
                                       resource_urls_[i],
                                       full_url);
+    PLUGIN_PRINTF(("PnaclResources::StartDownloads === created callback\n"));
     if (!plugin_->StreamAsFile(full_url,
                                ready_callback.pp_completion_callback())) {
-      ErrorInfo error_info;
-      error_info.SetReport(ERROR_UNKNOWN,
-                           "PnaclCoordinator: Failed to download file: " +
-                           resource_urls_[i] + "\n");
-      coordinator_->ReportLoadError(error_info);
-      coordinator_->PnaclNonPpapiError();
+      coordinator_->ReportNonPpapiError(
+          nacl::string("failed to download ") + resource_urls_[i] + "\n");
       break;
     }
+    PLUGIN_PRINTF(("PnaclResources::StartDownloads === invoked SAF\n"));
   }
   resource_urls_.clear();
 }
@@ -95,7 +87,8 @@
                                                full_url,
                                                "resource " + url);
   if (fd < 0) {
-    coordinator_->PnaclPpapiError(pp_error);
+    coordinator_->ReportPpapiError(pp_error,
+                                   "PnaclResources::ResourceReady failed.\n");
   } else {
     resource_wrappers_[url] =
         plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY);