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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f7b841877b0c6849d02dc738e33416eca78d4f9b..3f175fe14887e410b0917dfd8d4d4fdb3be965bb 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2290,18 +2290,13 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
       &(*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()));
+  fd = ui::GetLocalePackFd(&(*regions)[kAndroidLocalePakDescriptor]);
+  mappings->Share(kAndroidLocalePakDescriptor, fd);
 
   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()));