Revert of Pepper: Refactor OpenManifestEntry.

ppapi/native_client/src/trusted/plugin/service_runtime.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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 296 matching lines @@
 // (Some PPAPI actions -- like StreamAsFile -- can only run on the main thread).
 // OpenManifestEntry() is waiting on a condvar for this continuation to
 // complete.  We Broadcast and awaken OpenManifestEntry() whenever we are done
 // either here, or in a later MainThreadContinuation step, if there are
 // multiple steps.
 void PluginReverseInterface::OpenManifestEntry_MainThreadContinuation(
     OpenManifestEntryResource* p,
     int32_t err) {
   UNREFERENCED_PARAMETER(err);
   // CallOnMainThread continuations always called with err == PP_OK.
+
   NaClLog(4, "Entered OpenManifestEntry_MainThreadContinuation\n");
 
+  PP_Var pp_mapped_url;
+  PP_PNaClOptions pnacl_options = {PP_FALSE, PP_FALSE, 2};
+  if (!GetNaClInterface()->ManifestResolveKey(
+          plugin_->pp_instance(),
+          PP_FromBool(!service_runtime_->main_service_runtime()),
+          p->url.c_str(),
+          &pp_mapped_url,
+          &pnacl_options)) {
+    NaClLog(4, "OpenManifestEntry_MainThreadContinuation: ResolveKey failed\n");
+    // Failed, and error_info has the details on what happened.  Wake
+    // up requesting thread -- we are done.
+    {
+      nacl::MutexLocker take(&mu_);
+      *p->op_complete_ptr = true;  // done...
+      p->file_info->desc = -1;  // but failed.
+      NaClXCondVarBroadcast(&cv_);
+    }
+    p->MaybeRunCallback(PP_OK);
+    return;
+  }
+  nacl::string mapped_url = pp::Var(pp_mapped_url).AsString();
+  NaClLog(4,
+          "OpenManifestEntry_MainThreadContinuation: "
+          "ResolveKey: %s -> %s (pnacl_translate(%d))\n",
+          p->url.c_str(), mapped_url.c_str(), pnacl_options.translate);
+
+  if (pnacl_options.translate) {
+    // Requires PNaCl translation, but that's not supported.
+    NaClLog(4,
+            "OpenManifestEntry_MainThreadContinuation: "
+            "Requires PNaCl translation -- not supported\n");
+    {
+      nacl::MutexLocker take(&mu_);
+      *p->op_complete_ptr = true;  // done...
+      p->file_info->desc = -1;  // but failed.
+      NaClXCondVarBroadcast(&cv_);
+    }
+    p->MaybeRunCallback(PP_OK);
+    return;
+  }
+
   // Because p is owned by the callback of this invocation, so it is necessary
   // to create another instance.
   OpenManifestEntryResource* open_cont = new OpenManifestEntryResource(*p);
+  open_cont->url = mapped_url;
+  // Callback is now delegated from p to open_cont. So, here we manually clear
+  // complete callback.
+  p->callback = NULL;
 
   pp::CompletionCallback stream_cc = WeakRefNewCallback(
       anchor_,
       this,
       &PluginReverseInterface::StreamAsFile_MainThreadContinuation,
       open_cont);
 
-  GetNaClInterface()->OpenManifestEntry(
-      plugin_->pp_instance(),
-      PP_FromBool(!service_runtime_->main_service_runtime()),
-      p->url.c_str(),
-      &open_cont->pp_file_info,
-      stream_cc.pp_completion_callback());
+  GetNaClInterface()->DownloadFile(plugin_->pp_instance(),
+                                   mapped_url.c_str(),
+                                   &open_cont->pp_file_info,
+                                   stream_cc.pp_completion_callback());
   // p is deleted automatically.
 }
 
 void PluginReverseInterface::StreamAsFile_MainThreadContinuation(
     OpenManifestEntryResource* p,
     int32_t result) {
   NaClLog(4, "Entered StreamAsFile_MainThreadContinuation\n");
   {
     nacl::MutexLocker take(&mu_);
     if (result == PP_OK) {
@@ skipping 383 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin