Load language .pak files directly from the apk when using splits

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 139 matching lines @@
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user_manager.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
+#include "base/android/apk_assets.h"
+#include "base/android/build_info.h"
 #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
@@ skipping 2047 matching lines @@
     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;
-  const std::string locale = GetApplicationLocale();
-  base::FilePath locale_pak = ResourceBundle::GetSharedInstance().
-      GetLocaleFilePath(locale, false);
-  base::File file(locale_pak, flags);
-  DCHECK(file.IsValid());
-  mappings->Transfer(kAndroidLocalePakDescriptor,
-                     base::ScopedFD(file.TakePlatformFile()));
+  if (!locale_pak_fd_.is_valid()) {
+    const std::string locale = GetApplicationLocale();
+    if (ui::GetLocalePaksStoredInApk()) {
+      std::string pak_path = ui::GetPathForAndroidLocalePakWithinApk(locale);
+      locale_pak_fd_.reset(
+          base::android::OpenApkAsset(pak_path, &locale_pak_region_));
+    } else {
+      int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
+      base::FilePath locale_pak = ResourceBundle::GetSharedInstance().
+          GetLocaleFilePath(locale, false);
+      base::File file(locale_pak, flags);
+      locale_pak_fd_.reset(file.TakePlatformFile());
+      locale_pak_region_ = base::MemoryMappedFile::Region::kWholeFile;
+    }
+    DCHECK(locale_pak_fd_.is_valid());
+  }
+  mappings->Share(kAndroidLocalePakDescriptor, locale_pak_fd_.get());
+  regions->insert(
+      std::make_pair(kAndroidLocalePakDescriptor, locale_pak_region_));
 
   if (breakpad::IsCrashReporterEnabled()) {
-    file = breakpad::CrashDumpManager::GetInstance()->CreateMinidumpFile(
-               child_process_id);
+    base::File 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;
@@ skipping 180 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome