Revert 202278 "NaCl: enable meta-based validation for shared lib..."

Regressed Linux sizes for nacl_helper
http://build.chromium.org/p/chromium/buildstatus?builder=Linux&number=39450

> NaCl: enable meta-based validation for shared libraries.
> 
> This is the Chrome-side half of a CL to allow mmaping and skipping validation
> for chrome-extension: files we have seen before and know are safe.  To do this
> we need to know the path of the file on disk, but we don't entirely trust the
> renderer not to tamper with it.  To work around this, a nonce is passed along
> with the file handle.  This nonce can be used by the NaCl process to acquire the
> file handle directly from the browser process, as well as a fresh copy of the
> file handle.
> 
> This change significantly revises the OpenNaClExecutable method of the
> PPB_NaCl_Private interface.  The method was added anticipation of this CL, but
> the overall design shifted after the method was added.
> 
> BUG=https://code.google.com/p/chromium/issues/detail?id=224434
> 
> Review URL: https://chromiumcodereview.appspot.com/14750007

TBR=ncbray@chromium.org

Review URL: https://codereview.chromium.org/15820005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202304 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 14 deletions

diff --git a/chrome/common/nacl_messages.h b/chrome/common/nacl_messages.h
index f37ca83..acafe7e 100644
--- a/chrome/common/nacl_messages.h
+++ b/chrome/common/nacl_messages.h
@@ -9,7 +9,6 @@
 #include "chrome/common/nacl_types.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_platform_file.h"
 
 #define IPC_MESSAGE_START NaClMsgStart
 
@@ -79,15 +78,6 @@ IPC_SYNC_MESSAGE_CONTROL1_1(NaClProcessMsg_QueryKnownToValidate,
 IPC_MESSAGE_CONTROL1(NaClProcessMsg_SetKnownToValidate,
                      std::string /* A validation signature */)
 
-// Used by the NaCl process to acquire trusted information about a file directly
-// from the browser, including the file's path as well as a fresh version of the
-// file handle.
-IPC_SYNC_MESSAGE_CONTROL2_2(NaClProcessMsg_ResolveFileToken,
-                            uint64, /* file_token_lo */
-                            uint64, /* file_token_hi */
-                            IPC::PlatformFileForTransit, /* fd */
-                            base::FilePath /* Path opened to get fd */)
-
 // Notify the browser process that the server side of the PPAPI channel was
 // created successfully.
 IPC_MESSAGE_CONTROL1(NaClProcessHostMsg_PpapiChannelCreated,
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 366394a..5a946e3 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -614,12 +614,11 @@ IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_NaClErrorStatus,
 
 // A renderer sends this to the browser process when it wants to
 // open a NaCl executable file from an installed application directory.
-IPC_SYNC_MESSAGE_CONTROL2_3(ChromeViewHostMsg_OpenNaClExecutable,
+IPC_SYNC_MESSAGE_CONTROL2_2(ChromeViewHostMsg_OpenNaClExecutable,
                             int /* render_view_id */,
                             GURL /* URL of NaCl executable file */,
-                            IPC::PlatformFileForTransit /* output file */,
-                            uint64_t /* file_token_lo */,
-                            uint64_t /* file_token_hi */)
+                            base::FilePath /* absolute path to opened file */,
+                            IPC::PlatformFileForTransit /* output file */)
 
 // Notification that the page has an OpenSearch description document
 // associated with it.