Revert of Pass both 32 and 64 bit snapshot and natives fds to child processes.

android_webview/lib/main/aw_main_delegate.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.
 
 #include "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/browser_view_renderer.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/aw_descriptors.h"
@@ skipping 16 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"
 #include "components/external_video_surface/browser/android/external_video_surface_container_impl.h"
 #include "content/public/browser/android/browser_media_player_manager_register.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_switches.h"
 #include "gin/public/isolate_holder.h"
-#include "gin/v8_initializer.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "media/base/media_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace android_webview {
 
 namespace {
 
@@ skipping 63 matching lines @@
   // http://crbug.com/479767
   cl->AppendSwitch(switches::kEnableAggressiveDOMStorageFlushing);
 
   // Webview does not currently support the Presentation API, see
   // https://crbug.com/521319
   cl->AppendSwitch(switches::kDisablePresentationAPI);
 
   if (cl->GetSwitchValueASCII(switches::kProcessType).empty()) {
     // Browser process (no type specified).
 
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8NativesDataDescriptor32,
-        gin::V8Initializer::GetNativesFilePath(true).AsUTF8Unsafe());
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8SnapshotDataDescriptor32,
-        gin::V8Initializer::GetSnapshotFilePath(true).AsUTF8Unsafe());
-
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8NativesDataDescriptor64,
-        gin::V8Initializer::GetNativesFilePath(false).AsUTF8Unsafe());
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8SnapshotDataDescriptor64,
-        gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe());
+    // This code is needed to be able to mmap the V8 snapshot directly from
+    // the WebView .apk using architecture-specific names.
+    // This needs to be here so that it gets to run before the code in
+    // content_main_runner that reads these values tries to do so.
+#ifdef __LP64__
+    const char kNativesFileName[] = "assets/natives_blob_64.bin";
+    const char kSnapshotFileName[] = "assets/snapshot_blob_64.bin";
+#else
+    const char kNativesFileName[] = "assets/natives_blob_32.bin";
+    const char kSnapshotFileName[] = "assets/snapshot_blob_32.bin";
+#endif // __LP64__
+    // TODO(gsennton) we should use
+    // gin::IsolateHolder::kNativesFileName/kSnapshotFileName
+    // here when those files have arch specific names http://crbug.com/455699
+    CHECK(base::android::RegisterApkAssetWithGlobalDescriptors(
+        kV8NativesDataDescriptor, kNativesFileName));
+    CHECK(base::android::RegisterApkAssetWithGlobalDescriptors(
+        kV8SnapshotDataDescriptor, kSnapshotFileName));
   }
 
   if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) {
     cl->AppendSwitch(switches::kInProcessGPU);
     cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
     cl->AppendSwitch(switches::kDisableRendererBackgrounding);
   }
 
   return false;
 }
@@ skipping 104 matching lines @@
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwMainDelegate::CreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
       web_contents);
 }
 #endif
 
 }  // namespace android_webview