Allow OpenApkAsset() to open resource files as well as assets.

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/crash_reporter/aw_microdump_crash_reporter.h"
@@ skipping 88 matching lines @@
   cl->AppendSwitch(switches::kEnableAggressiveDOMStorageFlushing);
 
   // 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";
+  const char kNativesFileName[] = "assets/natives_blob_64.bin";
+  const char kSnapshotFileName[] = "assets/snapshot_blob_64.bin";
 #else
-  const char kNativesFileName[] = "natives_blob_32.bin";
-  const char kSnapshotFileName[] = "snapshot_blob_32.bin";
+  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));
 #endif
   CHECK(base::android::RegisterApkAssetWithGlobalDescriptors(
-      kAndroidICUDataDescriptor, base::i18n::kIcuDataFileName));
+      kAndroidICUDataDescriptor, "assets/icudtl.dat"));
 
   return false;
 }
 
 void AwMainDelegate::PreSandboxStartup() {
   // TODO(torne): When we have a separate renderer process, we need to handle
   // being passed open FDs for the resource paks here.
 #if defined(ARCH_CPU_ARM_FAMILY)
   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
   // cpu_brand info.
@@ skipping 67 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