Load v8 snapshots directly from APK (and store them uncompressed)

extensions/shell/browser/shell_content_browser_client.cc

Index: extensions/shell/browser/shell_content_browser_client.cc
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index dbb7f6f733eddd2172d421fe01c1eeeddacc6e44..1262cad54251fb9f30aa0dc85436a744cb96c322 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -28,7 +28,6 @@
 #include "extensions/shell/browser/shell_browser_main_parts.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/browser/shell_speech_recognition_manager_delegate.h"
-#include "gin/v8_initializer.h"
 #include "url/gurl.h"
 
 #if !defined(DISABLE_NACL)
@@ -54,12 +53,7 @@ ShellContentBrowserClient* g_instance = nullptr;
 
 ShellContentBrowserClient::ShellContentBrowserClient(
     ShellBrowserMainDelegate* browser_main_delegate)
-    :
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-      v8_natives_fd_(-1),
-      v8_snapshot_fd_(-1),
-#endif  // OS_POSIX && !OS_MACOSX
-      browser_main_parts_(nullptr),
+    : browser_main_parts_(nullptr),
       browser_main_delegate_(browser_main_delegate) {
   DCHECK(!g_instance);
   g_instance = this;
@@ -255,21 +249,24 @@ void ShellContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
-    int child_process_id,
-    content::FileDescriptorInfo* mappings) {
+    int child_process_id
+#if defined(OS_ANDROID)
+    , std::map<int, base::MemoryMappedFile::Region>* regions
+#endif
+    ) {
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-  if (v8_natives_fd_.get() == -1 || v8_snapshot_fd_.get() == -1) {
-    int v8_natives_fd = -1;
-    int v8_snapshot_fd = -1;
-    if (gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_natives_fd,
-                                                         &v8_snapshot_fd)) {
-      v8_natives_fd_.reset(v8_natives_fd);
-      v8_snapshot_fd_.reset(v8_snapshot_fd);
-    }
+  if (!v8_files_.IsLoaded()) {
+    gin::V8Initializer::OpenV8FilesForChildProcesses(&v8_files_);
   }
-  DCHECK(v8_natives_fd_.get() != -1 && v8_snapshot_fd_.get() != -1);
-  mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get());
-  mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());
+  DCHECK(v8_files_.IsLoaded());
+  mappings->Share(kV8NativesDataDescriptor, v8_files_.natives_fd.get());
+  mappings->Share(kV8SnapshotDataDescriptor, v8_files_.snapshot_fd.get());
+#if defined(OS_ANDROID)
+  regions->insert(
+      std::make_pair(kV8NativesDataDescriptor, v8_files_.natives_region));
+  regions->insert(
+      std::make_pair(kV8SnapshotDataDescriptor, v8_files_.snapshot_region));
+#endif  // defined(OS_ANDROID)
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 }
 #endif  // OS_POSIX && !OS_MACOSX