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

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
@@ skipping 725 matching lines @@
     // by the CommandLinePrefStore, and made available through the PrefService
     // via the preference prefs::kApplicationLocale. The browser process uses
     // the --lang flag to pass the value of the PrefService in here. Maybe
     // this value could be passed in a different way.
     const std::string locale =
         command_line.GetSwitchValueASCII(switches::kLang);
 #if defined(OS_ANDROID)
     // The renderer sandbox prevents us from accessing our .pak files directly.
     // Therefore file descriptors to the .pak files that we need are passed in
     // at process creation time.
-    int locale_pak_fd = base::GlobalDescriptors::GetInstance()->MaybeGet(
-        kAndroidLocalePakDescriptor);
-    CHECK(locale_pak_fd != -1);

[Yaron, 2015/06/17 14:12:28]

why are the CHECKs removed?

[agrieve, 2015/06/17 14:35:40]

I switched it to use global_descriptors->Get instead of
global_descriptors->MaybeGet. The only diff between these is that Get CHECKs.

-    ResourceBundle::InitSharedInstanceWithPakFileRegion(
-        base::File(locale_pak_fd), base::MemoryMappedFile::Region::kWholeFile);
+    auto global_descriptors = base::GlobalDescriptors::GetInstance();
+    int pak_fd = global_descriptors->Get(kAndroidLocalePakDescriptor);
+    base::MemoryMappedFile::Region pak_region =
+        global_descriptors->GetRegion(kAndroidLocalePakDescriptor);
+    ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
+                                                        pak_region);
 
     int extra_pak_keys[] = {
       kAndroidChrome100PercentPakDescriptor,
       kAndroidUIResourcesPakDescriptor,
     };
     for (size_t i = 0; i < arraysize(extra_pak_keys); ++i) {
-      int pak_fd =
-          base::GlobalDescriptors::GetInstance()->MaybeGet(extra_pak_keys[i]);
-      CHECK(pak_fd != -1);
-      ResourceBundle::GetSharedInstance().AddDataPackFromFile(
-          base::File(pak_fd), ui::SCALE_FACTOR_100P);
+      pak_fd = global_descriptors->Get(extra_pak_keys[i]);
+      pak_region = global_descriptors->GetRegion(extra_pak_keys[i]);
+      ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
+          base::File(pak_fd), pak_region, ui::SCALE_FACTOR_100P);
     }
 
     base::i18n::SetICUDefaultLocale(locale);
     const std::string loaded_locale = locale;
 #else
     const std::string loaded_locale =
         ui::ResourceBundle::InitSharedInstanceWithLocale(
             locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 
     base::FilePath resources_pack_path;
@@ skipping 213 matching lines @@
     case chrome::VersionInfo::CHANNEL_CANARY:
       return true;
     case chrome::VersionInfo::CHANNEL_DEV:
     case chrome::VersionInfo::CHANNEL_BETA:
     case chrome::VersionInfo::CHANNEL_STABLE:
     default:
       // Don't enable instrumentation.
       return false;
   }
 }