Files required by a service now listed in manifest.

content/app/android/child_process_service_impl.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_impl.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
+#include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/android/unguessable_token_android.h"
+#include "base/file_descriptor_store.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/posix/global_descriptors.h"
 #include "base/unguessable_token.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/common/content_descriptors.h"
 #include "gpu/ipc/common/android/scoped_surface_request_conduit.h"
 #include "gpu/ipc/common/gpu_surface_lookup.h"
 #include "ipc/ipc_descriptors.h"
 #include "jni/ChildProcessServiceImpl_jni.h"
+#include "services/service_manager/public/cpp/shared_file_util.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::JavaIntArrayToIntVector;
 using base::android::JavaParamRef;
 
 namespace content {
 
@@ skipping 79 matching lines @@
   gpu::GpuSurfaceLookup::InitInstance(
       g_child_process_surface_manager.Pointer());
   gpu::ScopedSurfaceRequestConduit::SetInstance(
       g_child_process_surface_manager.Pointer());
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
 }
 
 }  // namespace <anonymous>
 
+jlong CreateFileDescriptorStoreRegistrationContext(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jstring>& shared_param) {
+  if (shared_param.obj() == nullptr)

[boliu, 2017/02/09 23:59:54]

nit: shared_param.is_null()

[Jay Civelli, 2017/02/10 06:32:33]

Done.

+    return 0L;
+
+  std::string param = base::android::ConvertJavaStringToUTF8(env, shared_param);
+  std::unique_ptr<std::map<int, std::string>> values =

[boliu, 2017/02/09 23:59:54]

nit: auto

[Jay Civelli, 2017/02/10 06:32:34]

Done.

+      base::MakeUnique<std::map<int, std::string>>();
+  if (!service_manager::ParseSharedFileSwitchValue(param, values.get()))
+    return 0L;
+  return reinterpret_cast<jlong>(values.release());
+}
+
+void ReleaseFileDescriptorStoreRegistrationContext(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    jlong context) {
+  delete reinterpret_cast<std::map<int, std::string>*>(context);
+}
+
+jboolean RegisterInFileDescriptorStore(JNIEnv* env,
+                                       const JavaParamRef<jclass>& clazz,
+                                       jlong store_context,
+                                       jint id,
+                                       jint fd,
+                                       jlong offset,
+                                       jlong size) {
+  if (!store_context)
+    return false;
+
+  std::map<int, std::string>* id_to_keys =
+      reinterpret_cast<std::map<int, std::string>*>(store_context);

[boliu, 2017/02/09 23:59:54]

really should alias this

[Jay Civelli, 2017/02/10 06:32:34]

The method has changed and the map comes up just once now.

+  const auto& iter = id_to_keys->find(id);
+  if (iter == id_to_keys->end())
+    return false;
+
+  base::MemoryMappedFile::Region region = {offset, size};
+  base::FileDescriptorStore::GetInstance().Set(iter->second, base::ScopedFD(fd),
+                                               region);
+  return true;
+}
+
 void RegisterGlobalFileDescriptor(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz,
                                   jint id,
                                   jint fd,
                                   jlong offset,
                                   jlong size) {
   base::MemoryMappedFile::Region region = {offset, size};
   base::GlobalDescriptors::GetInstance()->Set(id, fd, region);
 }
 
@@ skipping 13 matching lines @@
 
 bool RegisterChildProcessServiceImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content