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

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 314 matching lines @@
     bool opener_suppressed,
     content::ResourceContext* context,
     int render_process_id,
     int opener_render_view_id,
     int opener_render_frame_id,
     bool* no_javascript_access) {
   *no_javascript_access = true;
   return false;
 }
 
+#if defined(OS_ANDROID)
 void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-    content::FileDescriptorInfo* mappings) {
-#if defined(OS_ANDROID)
-  const int flags_open_read = base::File::FLAG_OPEN | base::File::FLAG_READ;
-  base::FilePath pak_file_path;
-  CHECK(PathService::Get(FILE_CAST_PAK, &pak_file_path));
-  base::File pak_file(pak_file_path, flags_open_read);
-  if (!pak_file.IsValid()) {
-    NOTREACHED() << "Failed to open file when creating renderer process: "
-                 << "cast_shell.pak";
-  }
-  mappings->Transfer(kAndroidPakDescriptor,
-                     base::ScopedFD(pak_file.TakePlatformFile()));
+    FileDescriptorInfo* mappings,
+    std::map<int, base::MemoryMappedFile::Region>* regions) {
+  mappings->Share(
+      kAndroidPakDescriptor,
+      base::GlobalDescriptors::GetInstance()->Get(kAndroidPakDescriptor));
+  regions->insert(std::make_pair(
+      kAndroidPakDescriptor, base::GlobalDescriptors::GetInstance()->GetRegion(
+                                 kAndroidPakDescriptor)));
 
   if (breakpad::IsCrashReporterEnabled()) {
     base::File minidump_file(
         breakpad::CrashDumpManager::GetInstance()->CreateMinidumpFile(
             child_process_id));
     if (!minidump_file.IsValid()) {
       LOG(ERROR) << "Failed to create file for minidump, crash reporting will "
                  << "be disabled for this process.";
     } else {
       mappings->Transfer(kAndroidMinidumpDescriptor,
                          base::ScopedFD(minidump_file.TakePlatformFile()));
     }
   }
+}
 #else
+void CastContentBrowserClient::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)
-}
 
 #if defined(OS_ANDROID) && defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return external_video_surface::ExternalVideoSurfaceContainerImpl::Create(
       web_contents);
 }
 #endif  // defined(OS_ANDROID) && defined(VIDEO_HOLE)
 
@@ skipping 31 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast