Sanitize unparcable intents

chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java
index e110f7cd51d01e6c4cb6b125acd4198de3f6487a..2d051f905496fe997952090d10a94b5e76120f0d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java
@@ -4,9 +4,13 @@
 
 package org.chromium.chrome.browser.document;
 
+import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ApplicationState;
@@ -17,7 +21,11 @@ import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
+import java.lang.ref.WeakReference;
+import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicReference;
+
 
 /**
  * Tests for launching Chrome.
@@ -38,13 +46,42 @@ public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActiv
     }
 
     @SmallTest
-    public void testLaunchWithUrlNoScheme() throws Exception {
-        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("www.google.com"));
+    public void testLaunchWithUrlNoScheme() throws InterruptedException {
+        // Prepare intent
+        final String intentUrl = "www.google.com";
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(intentUrl));
+        intent.setClassName(mContext.getPackageName(), ChromeLauncherActivity.class.getName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        final Activity startedActivity = tryLaunchingChrome(intent);
+        final Intent activityIntent = startedActivity.getIntent();
+        assertEquals(intentUrl, activityIntent.getDataString());
+    }
+
+    @SmallTest
+    public void testDoesNotCrashWithBadParcel() throws InterruptedException {
+        // Prepare bad intent
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.google.com"));
+        final Parcel parcel = Parcel.obtain();
+        // Force unparcelling within ChromeLauncherActivity. Writing and reading from a parcel will
+        // simulate being parcelled by another application, and thus cause unmarshalling when
+        // Chrome tries reading an extra the next time.
+        intent.writeToParcel(parcel, 0);
+        intent.readFromParcel(parcel);
         intent.setClassName(mContext.getPackageName(), ChromeLauncherActivity.class.getName());
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra("BadExtra", new InvalidParcelable());
+
+        final Activity startedActivity = tryLaunchingChrome(intent);
+        final Intent activityIntent = startedActivity.getIntent();
+        assertEquals("Data was not preserved", intent.getData(), activityIntent.getData());
+        assertEquals("Action was not preserved", intent.getAction(), activityIntent.getAction());
+    }
+
+    private Activity tryLaunchingChrome(final Intent intent) throws InterruptedException {
         mContext.startActivity(intent);
 
-        // Check that Chrome launched successfully
+        // Check that ChromeLauncher Activity successfully launched
         CriteriaHelper.pollInstrumentationThread(
                 Criteria.equals(ApplicationState.HAS_RUNNING_ACTIVITIES, new Callable<Integer>() {
                     @Override
@@ -52,10 +89,41 @@ public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActiv
                         return ApplicationStatus.getStateForApplication();
                     }
                 }));
+
+        // Check that Chrome proper was successfully launched as a follow-up
+        final AtomicReference<Activity> launchedActivity = new AtomicReference<>();
+        CriteriaHelper.pollInstrumentationThread(
+                new Criteria("ChromeLauncherActivity did not start Chrome") {
+                    @Override
+                    public boolean isSatisfied() {
+                        final List<WeakReference<Activity>> references =
+                                ApplicationStatus.getRunningActivities();
+                        if (references.size() != 1) return false;
+                        launchedActivity.set(references.get(0).get());
+                        return launchedActivity.get() instanceof ChromeActivity;
+                    }
+                });
+        return launchedActivity.get();
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
     }
 
+    /**
+     * This Parcelable does not adhere to the form standards of a well formed Parcelable and will
+     * thus cause a BadParcelableException.  The lint suppression is needed since it detects that
+     * this will throw a BadParcelableException.
+     */
+    @SuppressLint("ParcelCreator")
+    private static class InvalidParcelable implements Parcelable {
+        @Override
+        public void writeToParcel(Parcel parcel, int params) {
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+    }
 }