Rationalize and fix chromium android linker histogram recording.

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 102 matching lines @@
 
 // Chrome actually uses the renderer code path for all of its child
 // processes such as renderers, plugins, etc.
 void InternalInitChildProcess(const std::vector<int>& file_ids,
                               const std::vector<int>& file_fds,
                               JNIEnv* env,
                               jclass clazz,
                               jobject context,
                               jobject service_in,
                               jint cpu_count,
-                              jlong cpu_features) {
+                              jlong cpu_features,
+                              jboolean use_linker,
+                              jboolean load_at_fixed_address_failed) {
   base::android::ScopedJavaLocalRef<jobject> service(env, service_in);
 
   // Set the CPU properties.
   android_setCpu(cpu_count, cpu_features);
   // Register the file descriptors.
   // This includes the IPC channel, the crash dump signals and resource related
   // files.
   DCHECK(file_fds.size() == file_ids.size());
   for (size_t i = 0; i < file_ids.size(); ++i)
     base::GlobalDescriptors::GetInstance()->Set(file_ids[i], file_fds[i]);
 
   // SurfaceTexturePeerChildImpl implements the SurfaceTextureLookup interface,
   // which need to be set before we create a compositor thread that could be
   // using it to initialize resources.
   content::SurfaceTexturePeer::InitInstance(
       new SurfaceTexturePeerChildImpl(service));
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
+
+  // Save any chromium linker histogram value for later recording.
+  if (use_linker) {
+    base::android::RegisterChromiumAndroidLinkerRendererHistogram(
+        load_at_fixed_address_failed);
+  }
 }
 
 }  // namespace <anonymous>
 
 void InitChildProcess(JNIEnv* env,
                       jclass clazz,
                       jobject context,
                       jobject service,
                       jintArray j_file_ids,
                       jintArray j_file_fds,
                       jint cpu_count,
-                      jlong cpu_features) {
+                      jlong cpu_features,
+                      jboolean use_linker,

[rmcilroy, 2014/10/01 12:14:42]

nit - used_chromium_linker (and in the Java file)

[simonb (inactive), 2014/10/02 15:15:30]

Changes to this file reverted entirely as part of a rewrite.

+                      jboolean load_at_fixed_address_failed) {
   std::vector<int> file_ids;
   std::vector<int> file_fds;
   JavaIntArrayToIntVector(env, j_file_ids, &file_ids);
   JavaIntArrayToIntVector(env, j_file_fds, &file_fds);
 
   InternalInitChildProcess(
       file_ids, file_fds, env, clazz, context, service,
-      cpu_count, cpu_features);
+      cpu_count, cpu_features,
+      use_linker, load_at_fixed_address_failed);
 }
 
 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) {
   ChildThread::ShutdownThread();
 }
 
 }  // namespace content