Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 145 matching lines @@
 #include "components/user_manager/user_manager.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
 #include "chrome/browser/android/new_tab_page_url_handler.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "chrome/browser/chrome_browser_main_android.h"
 #include "chrome/common/descriptors_android.h"
 #include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
+#include "ui/base/resource/resource_bundle_android.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
 #include "components/crash/app/breakpad_linux.h"
 #include "components/crash/browser/crash_handler_host_linux.h"
 #endif
 
@@ skipping 2026 matching lines @@
   DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal));
   additional_backends->push_back(backend);
 #endif
 
   for (size_t i = 0; i < extra_parts_.size(); ++i) {
     extra_parts_[i]->GetAdditionalFileSystemBackends(
         browser_context, storage_partition_path, additional_backends);
   }
 }
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_ANDROID)
 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-    FileDescriptorInfo* mappings) {
-#if defined(OS_ANDROID)
-  base::FilePath data_path;
-  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
-  DCHECK(!data_path.empty());
+    FileDescriptorInfo* mappings,
+    std::map<int, base::MemoryMappedFile::Region>* regions) {
+  int fd = ui::GetMainAndroidPackFd(
+      &(*regions)[kAndroidUIResourcesPakDescriptor]);
+  mappings->Share(kAndroidUIResourcesPakDescriptor, fd);
+
+  fd = ui::GetCommonResourcesPackFd(
+      &(*regions)[kAndroidChrome100PercentPakDescriptor]);
+  mappings->Share(kAndroidChrome100PercentPakDescriptor, fd);
 
   int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
-  base::FilePath chrome_resources_pak =
-      data_path.AppendASCII("chrome_100_percent.pak");
-  base::File file(chrome_resources_pak, flags);
-  DCHECK(file.IsValid());
-  mappings->Transfer(kAndroidChrome100PercentPakDescriptor,
-                     base::ScopedFD(file.TakePlatformFile()));
-
   const std::string locale = GetApplicationLocale();
   base::FilePath locale_pak = ResourceBundle::GetSharedInstance().
       GetLocaleFilePath(locale, false);
-  file.Initialize(locale_pak, flags);
+  base::File file(locale_pak, flags);
   DCHECK(file.IsValid());
   mappings->Transfer(kAndroidLocalePakDescriptor,
                      base::ScopedFD(file.TakePlatformFile()));
 
-  base::FilePath resources_pack_path;
-  PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
-  file.Initialize(resources_pack_path, flags);
-  DCHECK(file.IsValid());
-  mappings->Transfer(kAndroidUIResourcesPakDescriptor,
-                     base::ScopedFD(file.TakePlatformFile()));
-
   if (breakpad::IsCrashReporterEnabled()) {
     file = breakpad::CrashDumpManager::GetInstance()->CreateMinidumpFile(
                child_process_id);
     if (file.IsValid()) {
       mappings->Transfer(kAndroidMinidumpDescriptor,
                          base::ScopedFD(file.TakePlatformFile()));
     } else {
       LOG(ERROR) << "Failed to create file for minidump, crash reporting will "
                  "be disabled for this process.";
     }
   }
 
   base::FilePath app_data_path;
   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
   DCHECK(!app_data_path.empty());
-#else
+}
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+    const base::CommandLine& command_line,
+    int child_process_id,
+    FileDescriptorInfo* mappings) {
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
     mappings->Share(kCrashDumpSignal, crash_signal_fd);
   }
+}
 #endif  // defined(OS_ANDROID)
-}
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() {
   return chrome::kBrowserResourcesDll;
 }
 
 void ChromeContentBrowserClient::PreSpawnRenderer(
     sandbox::TargetPolicy* policy,
     bool* success) {
   // This code is duplicated in nacl_exe_win_64.cc.
@@ skipping 156 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome