Pepper: Simplify manifest download logic.

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
@@ skipping 26 matching lines @@
 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h"
 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 #include "ppapi/native_client/src/trusted/plugin/utility.h"
 
 namespace plugin {
 
 namespace {
 
-// This is a pretty arbitrary limit on the byte size of the NaCl manfest file.
-// Note that the resulting string object has to have at least one byte extra
-// for the null termination character.
-const size_t kNaClManifestMaxFileBytes = 1024 * 1024;
-
 // Up to 20 seconds
 const int64_t kTimeSmallMin = 1;         // in ms
 const int64_t kTimeSmallMax = 20000;     // in ms
 const uint32_t kTimeSmallBuckets = 100;
 
 const int64_t kSizeKBMin = 1;
 const int64_t kSizeKBMax = 512*1024;     // very large .nexe
 const uint32_t kSizeKBBuckets = 100;
 
 }  // namespace
@@ skipping 529 matching lines @@
                                   true,
                                   &UpdateDownloadProgress));
       }
       return;
     }
   }
 }
 
 void Plugin::RequestNaClManifest(const nacl::string& url) {
   PLUGIN_PRINTF(("Plugin::RequestNaClManifest (url='%s')\n", url.c_str()));
-  PP_Bool is_data_uri;
-  ErrorInfo error_info;
-  if (!nacl_interface_->RequestNaClManifest(pp_instance(), url.c_str(),
-                                            &is_data_uri))
-    return;
-  pp::Var nmf_resolved_url =
-      pp::Var(pp::PASS_REF, nacl_interface_->GetManifestBaseURL(pp_instance()));
-  if (is_data_uri) {
-    std::string string_nmf_resolved_url = nmf_resolved_url.AsString();
-    pp::Var nmf_data = pp::Var(
-        pp::PASS_REF,
-        nacl_interface_->ParseDataURL(string_nmf_resolved_url.c_str()));
-    if (!nmf_data.is_string()) {
-      error_info.SetReport(PP_NACL_ERROR_MANIFEST_LOAD_URL,
-                           "could not load manifest url.");
-      ReportLoadError(error_info);
-    } else if (nmf_data.AsString().size() > kNaClManifestMaxFileBytes) {
-      error_info.SetReport(PP_NACL_ERROR_MANIFEST_TOO_LARGE,
-                           "manifest file too large.");
-      ReportLoadError(error_info);
-    } else {
-      ProcessNaClManifest(nmf_data.AsString());
-    }
-  } else {
-    pp::CompletionCallback open_callback =
-        callback_factory_.NewCallback(&Plugin::NaClManifestFileDidOpen);
-    std::string nmf_resolved_url_str = nmf_resolved_url.AsString();
-    nacl_interface_->DownloadManifestToBuffer(
-        pp_instance(),
-        &manifest_data_var_,
-        open_callback.pp_completion_callback());
-  }
+  pp::CompletionCallback open_callback =
+      callback_factory_.NewCallback(&Plugin::NaClManifestFileDidOpen);
+  nacl_interface_->RequestNaClManifest(pp_instance(),
+                                       url.c_str(),
+                                       &manifest_data_var_,
+                                       open_callback.pp_completion_callback());
 }
 
 
 bool Plugin::SetManifestObject(const nacl::string& manifest_json) {
   PLUGIN_PRINTF(("Plugin::SetManifestObject(): manifest_json='%s'.\n",
        manifest_json.c_str()));
   // Determine whether lookups should use portable (i.e., pnacl versions)
   // rather than platform-specific files.
   pp::Var manifest_base_url =
       pp::Var(pp::PASS_REF, nacl_interface_->GetManifestBaseURL(pp_instance()));
@@ skipping 217 matching lines @@
 
 void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
                                        int exit_status) {
   DCHECK(pp::Module::Get()->core()->IsMainThread());
   DCHECK(nacl_interface_);
   nacl_interface_->SetExitStatus(pp_instance(), exit_status);
 }
 
 
 }  // namespace plugin