Index: chromecast/browser/cast_content_browser_client.cc |
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc |
index 2d1027bb1ee90b990be16be18942f4a11d1f6c2b..8fc4b4bdb5de1e2ea00465fb64b947301eb09bf8 100644 |
--- a/chromecast/browser/cast_content_browser_client.cc |
+++ b/chromecast/browser/cast_content_browser_client.cc |
@@ -332,18 +332,18 @@ bool CastContentBrowserClient::CanCreateWindow( |
void CastContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
const base::CommandLine& command_line, |
int child_process_id, |
- content::FileDescriptorInfo* mappings) { |
+ 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())); |
+ , std::map<int, base::MemoryMappedFile::Region>* regions |
+#endif |
+ ) { |
+#if defined(OS_ANDROID) |
+ 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( |