Merge 175820

content/app/android/sandboxed_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/sandboxed_process_service.h"
 
+#include <cpu-features.h>
+
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "content/common/android/surface_texture_peer.h"
 #include "content/common/child_process.h"
 #include "content/common/child_thread.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/common/content_descriptors.h"
 #include "ipc/ipc_descriptors.h"
 #include "jni/SandboxedProcessService_jni.h"
@@ skipping 36 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SurfaceTexturePeerSandboxedImpl);
 };
 
 // Chrome actually uses the renderer code path for all of its sandboxed
 // processes such as renderers, plugins, etc.
 void InternalInitSandboxedProcess(const std::vector<int>& file_ids,
                                   const std::vector<int>& file_fds,
                                   JNIEnv* env,
                                   jclass clazz,
                                   jobject context,
-                                  jobject service) {
+                                  jobject service,
+                                  jint cpu_count,
+                                  jlong cpu_features) {
+  // 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]);
 
   content::SurfaceTexturePeer::InitInstance(
       new SurfaceTexturePeerSandboxedImpl(service));
 
 }
 
 void QuitSandboxMainThreadMessageLoop() {
   MessageLoop::current()->Quit();
 }
 
 }  // namespace <anonymous>
 
 namespace content {
 
 void InitSandboxedProcess(JNIEnv* env,
                           jclass clazz,
                           jobject context,
                           jobject service,
                           jintArray j_file_ids,
-                          jintArray j_file_fds) {
+                          jintArray j_file_fds,
+                          jint cpu_count,
+                          jlong cpu_features) {
   std::vector<int> file_ids;
   std::vector<int> file_fds;
   JavaIntArrayToIntVector(env, j_file_ids, &file_ids);
   JavaIntArrayToIntVector(env, j_file_fds, &file_fds);
 
   InternalInitSandboxedProcess(
-      file_ids, file_fds, env, clazz, context, service);
+      file_ids, file_fds, env, clazz, context, service,
+      cpu_count, cpu_features);
 }
 
 void ExitSandboxedProcess(JNIEnv* env, jclass clazz) {
   LOG(INFO) << "SandboxedProcessService: Exiting sandboxed process.";
   LibraryLoaderExitHook();
   _exit(0);
 }
 
 bool RegisterSandboxedProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownSandboxMainThread(JNIEnv* env, jobject obj) {
   ChildProcess* current_process = ChildProcess::current();
   if (!current_process)
     return;
   ChildThread* main_child_thread = current_process->main_thread();
   if (main_child_thread && main_child_thread->message_loop())
     main_child_thread->message_loop()->PostTask(FROM_HERE,
         base::Bind(&QuitSandboxMainThreadMessageLoop));
 }
 
 }  // namespace content