Sanitize unparcable intents

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
index 04fcc20a57f935529e4efe45fab93877d575006b..15fecc16943de05d6d7c55a599bf4e7a30401216 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
@@ -89,7 +89,10 @@ public class ChromeApplication extends ContentApplication {
 
     public ChromeApplication() {
         super();
-        ContextUtils.initApplicationContext(this);
+        // Do not try to reset a test context.
+        if (ContextUtils.getApplicationContext() == null) {

[Ted C, 2016/10/04 20:19:23]

why do we need to add this?  IMO, the test should be the one that needs to
special case handle this and not the production code.

[kraush, 2016/10/04 21:36:36]

This was required because the test framework spawns an application (Based on
@Config)
--> I'll instead base TestableChromeApplication on BaseChromiumApplication, that
way this change won't be required.

+            ContextUtils.initApplicationContext(this);
+        }
     }
 
     /**