Revert of Name V8 snapshot according to target architecture (32/64 bit).

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/lib/aw_browser_dependency_factory_impl.h"
@@ skipping 74 matching lines @@
   // This is needed for sharing textures across the different GL threads.
   cl->AppendSwitch(switches::kEnableThreadedTextureMailboxes);
 
   // This is needed to be able to mmap the V8 snapshot and ICU data file
   // directly from the WebView .apk.
   // 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.
   // In multi-process mode this code would live in
   // AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess.
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
-#ifdef __LP64__
-  const char kNativesFileName[] = "natives_blob_64.bin";
-  const char kSnapshotFileName[] = "snapshot_blob_64.bin";
-#else
-  const char kNativesFileName[] = "natives_blob_32.bin";
-  const char kSnapshotFileName[] = "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(AwAssets::RegisterAssetWithGlobalDescriptors(
-      kV8NativesDataDescriptor, kNativesFileName));
+      kV8NativesDataDescriptor, gin::IsolateHolder::kNativesFileName));
   CHECK(AwAssets::RegisterAssetWithGlobalDescriptors(
-      kV8SnapshotDataDescriptor, kSnapshotFileName));
+      kV8SnapshotDataDescriptor, gin::IsolateHolder::kSnapshotFileName));
 #endif
   // TODO(mkosiba): make this CHECK when the android_webview_build uses an asset
   // from the .apk too.
   AwAssets::RegisterAssetWithGlobalDescriptors(
       kAndroidICUDataDescriptor, base::i18n::kIcuDataFileName);
 
   return false;
 }
 
 void AwMainDelegate::PreSandboxStartup() {
@@ skipping 69 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwMainDelegate::CreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return new ExternalVideoSurfaceContainerImpl(web_contents);
 }
 #endif
 
 }  // namespace android_webview