Rationalize and fix chromium android linker histogram recording.

content/app/android/child_process_service.cc

Index: content/app/android/child_process_service.cc
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index 62c04d6623eb179a6d7b7103e614a97839042f46..1ce238cc8ff456ef462f80717d914a580f49273e 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -120,7 +120,9 @@ void InternalInitChildProcess(const std::vector<int>& file_ids,
                               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.
@@ -139,6 +141,12 @@ void InternalInitChildProcess(const std::vector<int>& file_ids,
       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>
@@ -150,7 +158,9 @@ void InitChildProcess(JNIEnv* env,
                       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);
@@ -158,7 +168,8 @@ void InitChildProcess(JNIEnv* env,
 
   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) {