Merge 175820

content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java

Index: content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java
===================================================================
--- content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java	(revision 177674)
+++ content/public/android/java/src/org/chromium/content/app/SandboxedProcessService.java	(working copy)
@@ -47,6 +47,8 @@
     // Parameters received via IPC, only accessed while holding the mSandboxMainThread monitor.
     private String mNativeLibraryName;  // Must be passed in via the bind command.
     private String[] mCommandLineParams;
+    private int mCpuCount;
+    private long mCpuFeatures;
     // Pairs IDs and file descriptors that should be registered natively.
     private ArrayList<Integer> mFileIds;
     private ArrayList<ParcelFileDescriptor> mFileFds;
@@ -69,6 +71,9 @@
                 }
                 // We must have received the command line by now
                 assert mCommandLineParams != null;
+                mCpuCount = args.getInt(SandboxedProcessConnection.EXTRA_CPU_COUNT);
+                mCpuFeatures = args.getLong(SandboxedProcessConnection.EXTRA_CPU_FEATURES);
+                assert mCpuCount > 0;
                 mFileIds = new ArrayList<Integer>();
                 mFileFds = new ArrayList<ParcelFileDescriptor>();
                 for (int i = 0;; i++) {
@@ -142,7 +147,8 @@
                     }
                     ContentMain.initApplicationContext(sContext.getApplicationContext());
                     nativeInitSandboxedProcess(sContext.getApplicationContext(),
-                            SandboxedProcessService.this, fileIds, fileFds);
+                            SandboxedProcessService.this, fileIds, fileFds,
+                            mCpuCount, mCpuFeatures);
                     ContentMain.start();
                     nativeExitSandboxedProcess();
                 } catch (InterruptedException e) {
@@ -249,7 +255,8 @@
      * renderer.
      */
     private static native void nativeInitSandboxedProcess(Context applicationContext,
-            SandboxedProcessService service, int[] extraFileIds, int[] extraFileFds);
+            SandboxedProcessService service, int[] extraFileIds, int[] extraFileFds,
+            int cpuCount, long cpuFeatures);
 
     /**
      * Force the sandboxed process to exit.