Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10426)

Unified Diff: chrome/renderer/pepper/ppb_nacl_private_impl.cc

Issue 14750007: NaCl: enable meta-based validation for shared libraries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/pepper/ppb_nacl_private_impl.cc
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
index 60a79ebced056e9d998c3064177d656b8fdb66f7..cc30657f83099a15a2dd163c2e68d7fe1fd44239 100644
--- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc
+++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc
@@ -272,19 +272,19 @@ PP_NaClResult ReportNaClError(PP_Instance instance,
PP_FileHandle OpenNaClExecutable(PP_Instance instance,
const char* file_url,
- PP_NaClExecutableMetadata* metadata) {
+ uint64_t* nonce) {
IPC::PlatformFileForTransit out_fd = IPC::InvalidPlatformFileForTransit();
IPC::Sender* sender = content::RenderThread::Get();
if (sender == NULL)
sender = g_background_thread_sender.Pointer()->get();
- metadata->file_path = PP_MakeUndefined();
+ *nonce = 0;
base::FilePath file_path;
if (!sender->Send(
new ChromeViewHostMsg_OpenNaClExecutable(GetRoutingID(instance),
GURL(file_url),
- &file_path,
- &out_fd))) {
+ &out_fd,
+ nonce))) {
return base::kInvalidPlatformFileValue;
}
@@ -292,9 +292,6 @@ PP_FileHandle OpenNaClExecutable(PP_Instance instance,
return base::kInvalidPlatformFileValue;
}
- metadata->file_path =
- ppapi::StringVar::StringToPPVar(file_path.AsUTF8Unsafe());
-
base::PlatformFile handle =
IPC::PlatformFileForTransitToPlatformFile(out_fd);
return handle;

Powered by Google App Engine
This is Rietveld 408576698