Enable mmap and identity-based validation caching on pnacl-{llc,ld}.nexe

components/nacl/browser/nacl_browser.cc

 // Copyright 2013 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.
 
 #include "components/nacl/browser/nacl_browser.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_proxy.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 95 matching lines @@
 }
 
 // Crash throttling parameters.
 const size_t kMaxCrashesPerInterval = 3;
 const int64 kCrashesIntervalInSeconds = 120;
 
 }  // namespace
 
 namespace nacl {
 
-base::File OpenNaClExecutableImpl(const base::FilePath& file_path) {
+base::File OpenNaClReadExecImpl(const base::FilePath& file_path,
+                                bool is_executable) {
   // Get a file descriptor. On Windows, we need 'GENERIC_EXECUTE' in order to
   // memory map the executable.
   // IMPORTANT: This file descriptor must not have write access - that could
   // allow a NaCl inner sandbox escape.
   base::File file(file_path,
+                  is_executable ?

[Nick Bray (chromium), 2014/06/27 21:03:16]

Nit: build the flags before the call to avoid redundant code and improve
clarity.

[jvoung (off chromium), 2014/06/27 22:30:08]

Done.

                   (base::File::FLAG_OPEN |
                    base::File::FLAG_READ |
-                   base::File::FLAG_EXECUTE));  // Windows only flag.
+                   base::File::FLAG_EXECUTE) : // Windows only flag.
+                  (base::File::FLAG_OPEN |
+                   base::File::FLAG_READ));
   if (!file.IsValid())
     return file.Pass();
 
   // Check that the file does not reference a directory. Returning a descriptor
   // to an extension directory could allow an outer sandbox escape. openat(...)
   // could be used to traverse into the file system.
   base::File::Info file_info;
   if (!file.GetInfo(&file_info) || file_info.is_directory)
     return base::File();
 
@@ skipping 419 matching lines @@
 bool NaClBrowser::IsThrottled() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (crash_times_.size() != kMaxCrashesPerInterval) {
     return false;
   }
   base::TimeDelta delta = base::Time::Now() - crash_times_.front();
   return delta.InSeconds() <= kCrashesIntervalInSeconds;
 }
 
 }  // namespace nacl