Store and load icudtl.dat directly from the apk rather than extracting on start-up

extensions/shell/browser/shell_content_browser_client.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "components/guest_view/browser/guest_view_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 235 matching lines @@
     std::vector<std::string>* additional_allowed_schemes) {
   ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
       additional_allowed_schemes);
   additional_allowed_schemes->push_back(kExtensionScheme);
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-    content::FileDescriptorInfo* mappings) {
+    content::FileDescriptorInfo* mappings
+#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);
     }
   }
@@ skipping 35 matching lines @@
 
 const Extension* ShellContentBrowserClient::GetExtension(
     content::SiteInstance* site_instance) {
   ExtensionRegistry* registry =
       ExtensionRegistry::Get(site_instance->GetBrowserContext());
   return registry->enabled_extensions().GetExtensionOrAppByURL(
       site_instance->GetSiteURL());
 }
 
 }  // namespace extensions