Sanitize unparcable intents

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

Index: chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
index bcb8430a9f46ba026e6e3e6e2ba056d101206aa9..dab45b5b0871e725cee5ec59cc9b13f253932bd1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -611,9 +611,13 @@ public class IntentHandler {
      *
      * To track page load time, this needs to be called as close as possible to
      * the entry point (in {@link Activity#onCreate()} for instance).
+     *
+     * In case the passed intent cannot be unmarshelled, this will return a sanitized intent.
+     *
+     * @return the sanitized intent including the extra timestamp
      */
-    public static void addTimestampToIntent(Intent intent) {
-        intent.putExtra(EXTRA_TIMESTAMP_MS, SystemClock.elapsedRealtime());
+    public static Intent addTimestampToIntent(Intent intent) {
+        return IntentUtils.safePutExtra(intent, EXTRA_TIMESTAMP_MS, SystemClock.elapsedRealtime());
     }
 
     /**