[Android] Switch gtests to platform mode.

BUG=428729

Review URL: https://codereview.chromium.org/1315953007

Cr-Commit-Position: refs/heads/master@{#349526}

3 files changed, 20 insertions, 16 deletions

diff --git a/testing/android/native_test/java/AndroidManifest.xml b/testing/android/native_test/java/AndroidManifest.xml
index c14923c..6de21b1 100644
--- a/testing/android/native_test/java/AndroidManifest.xml
+++ b/testing/android/native_test/java/AndroidManifest.xml
@@ -24,7 +24,8 @@ found in the LICENSE file.
             android:name="org.chromium.base.BaseChromiumApplication">
         <activity android:name=".NativeUnitTestActivity"
                 android:label="NativeTest"
-                android:configChanges="orientation|keyboardHidden">
+                android:configChanges="orientation|keyboardHidden"
+                android:process=":test_process">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java
index 73a563c..1c3d262 100644
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java
@@ -32,13 +32,14 @@ public class NativeTestActivity extends Activity {
             "org.chromium.native_test.NativeTestActivity.CommandLineFile";
     public static final String EXTRA_COMMAND_LINE_FLAGS =
             "org.chromium.native_test.NativeTestActivity.CommandLineFlags";
+    public static final String EXTRA_RUN_IN_SUB_THREAD =
+            "org.chromium.native_test.NativeTestActivity.RunInSubThread";
     public static final String EXTRA_SHARD =
             "org.chromium.native_test.NativeTestActivity.Shard";
     public static final String EXTRA_STDOUT_FILE =
             "org.chromium.native_test.NativeTestActivity.StdoutFile";
 
     private static final String TAG = "cr.native_test";
-    private static final String EXTRA_RUN_IN_SUB_THREAD = "RunInSubThread";
 
     private String mCommandLineFilePath;
     private StringBuilder mCommandLineFlags = new StringBuilder();
@@ -57,6 +58,12 @@ public class NativeTestActivity extends Activity {
     }
 
     private void parseArgumentsFromIntent(Intent intent) {
+        Log.i(TAG, "Extras:");
+        Bundle extras = intent.getExtras();
+        for (String s : extras.keySet()) {
+            Log.i(TAG, "  %s", s);
+        }
+
         mCommandLineFilePath = intent.getStringExtra(EXTRA_COMMAND_LINE_FILE);
         if (mCommandLineFilePath == null) {
             mCommandLineFilePath = "";
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java
index 6e39401..1774786 100644
--- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java
+++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java
@@ -63,11 +63,10 @@ public class NativeTestInstrumentationTestRunner extends Instrumentation {
             Pattern.compile("\\[ *([^ ]*) *\\] ?([^ ]+)( .*)?$");
 
     private ResultsBundleGenerator mBundleGenerator = new RobotiumBundleGenerator();
-    private String mCommandLineFile;
-    private String mCommandLineFlags;
     private Handler mHandler = new Handler();
-    private String mNativeTestActivity;
     private Bundle mLogBundle = new Bundle();
+    private SparseArray<ShardMonitor> mMonitors = new SparseArray<ShardMonitor>();
+    private String mNativeTestActivity;
     private TestStatusReceiver mReceiver;
     private Map<String, ResultsBundleGenerator.TestResult> mResults =
             new HashMap<String, ResultsBundleGenerator.TestResult>();
@@ -75,20 +74,23 @@ public class NativeTestInstrumentationTestRunner extends Instrumentation {
     private long mShardNanoTimeout = DEFAULT_SHARD_NANO_TIMEOUT;
     private int mShardSizeLimit = DEFAULT_SHARD_SIZE_LIMIT;
     private File mStdoutFile;
-    private SparseArray<ShardMonitor> mMonitors = new SparseArray<ShardMonitor>();
+    private Bundle mTransparentArguments;
 
     @Override
     public void onCreate(Bundle arguments) {
-        mCommandLineFile = arguments.getString(NativeTestActivity.EXTRA_COMMAND_LINE_FILE);
-        mCommandLineFlags = arguments.getString(NativeTestActivity.EXTRA_COMMAND_LINE_FLAGS);
+        mTransparentArguments = new Bundle(arguments);
+
         mNativeTestActivity = arguments.getString(EXTRA_NATIVE_TEST_ACTIVITY);
         if (mNativeTestActivity == null) mNativeTestActivity = DEFAULT_NATIVE_TEST_ACTIVITY;
+        mTransparentArguments.remove(EXTRA_NATIVE_TEST_ACTIVITY);
 
         String shardNanoTimeout = arguments.getString(EXTRA_SHARD_NANO_TIMEOUT);
         if (shardNanoTimeout != null) mShardNanoTimeout = Long.parseLong(shardNanoTimeout);
+        mTransparentArguments.remove(EXTRA_SHARD_NANO_TIMEOUT);
 
         String shardSizeLimit = arguments.getString(EXTRA_SHARD_SIZE_LIMIT);
         if (shardSizeLimit != null) mShardSizeLimit = Integer.parseInt(shardSizeLimit);
+        mTransparentArguments.remove(EXTRA_SHARD_SIZE_LIMIT);
 
         String testListFilePath = arguments.getString(EXTRA_TEST_LIST_FILE);
         if (testListFilePath != null) {
@@ -116,6 +118,7 @@ public class NativeTestInstrumentationTestRunner extends Instrumentation {
                 Log.e(TAG, "Error reading %s", testListFile.getAbsolutePath(), e);
             }
         }
+        mTransparentArguments.remove(EXTRA_TEST_LIST_FILE);
 
         try {
             mStdoutFile = File.createTempFile(
@@ -220,14 +223,7 @@ public class NativeTestInstrumentationTestRunner extends Instrumentation {
             Intent i = new Intent(Intent.ACTION_MAIN);
             i.setComponent(new ComponentName(getContext().getPackageName(), mNativeTestActivity));
             i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            if (mCommandLineFile != null) {
-                Log.i(TAG, "Passing command line file extra: %s", mCommandLineFile);
-                i.putExtra(NativeTestActivity.EXTRA_COMMAND_LINE_FILE, mCommandLineFile);
-            }
-            if (mCommandLineFlags != null) {
-                Log.i(TAG, "Passing command line flag extra: %s", mCommandLineFlags);
-                i.putExtra(NativeTestActivity.EXTRA_COMMAND_LINE_FLAGS, mCommandLineFlags);
-            }
+            i.putExtras(mTransparentArguments);
             if (mShards != null && !mShards.isEmpty()) {
                 ArrayList<String> shard = mShards.remove();
                 i.putStringArrayListExtra(NativeTestActivity.EXTRA_SHARD, shard);