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 <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 2272 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()));
+  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()));
     } else {
       LOG(ERROR) << "Failed to create file for minidump, crash reporting will "
                  "be disabled for this process.";
     }
   }
 
   base::FilePath app_data_path;
@@ skipping 228 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome