Take 2: Moved logic for mapping child process FDs for ICU and V8 into child_process_launcher.cc

content/app/android/child_process_service.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 "content/app/android/child_process_service.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
@@ skipping 136 matching lines @@
 }
 
 }  // namespace <anonymous>
 
 void RegisterGlobalFileDescriptor(JNIEnv* env,
                                   jclass clazz,
                                   jint id,
                                   jint fd,
                                   jlong offset,
                                   jlong size) {
-  base::MemoryMappedFile::Region region(offset, size);
+  base::MemoryMappedFile::Region region = {offset, size};
   base::GlobalDescriptors::GetInstance()->Set(id, fd, region);
 }
 
 void InitChildProcess(JNIEnv* env,
                       jclass clazz,
                       jobject context,
                       jobject service,
                       jint cpu_count,
                       jlong cpu_features) {
   InternalInitChildProcess(env, clazz, context, service, cpu_count,
                            cpu_features);
 }
 
 void ExitChildProcess(JNIEnv* env, jclass clazz) {
   VLOG(0) << "ChildProcessService: Exiting child process.";
   base::android::LibraryLoaderExitHook();
   _exit(0);
 }
 
 bool RegisterChildProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, jobject obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content