Kick incognito tabs from CCTs to tabbed mode.

chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
index 9ffba3e3cb1ad4b7bd45e818479602b2e597a3c9..983145b737f6b0f70f0c9a98c415438ba83d1cc8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
@@ -31,6 +31,8 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import javax.annotation.Nullable;
+
 /**
  * Utilities for detecting multi-window/multi-instance support.
  *
@@ -156,8 +158,8 @@ public class MultiWindowUtils implements ActivityStateListener {
      * @param context The current Context, used to retrieve the ActivityManager system service.
      * @return The ChromeTabbedActivity to use for the incoming intent.
      */
-    public Class<? extends ChromeTabbedActivity> getTabbedActivityForIntent(Intent intent,
-            Context context) {
+    public Class<? extends ChromeTabbedActivity> getTabbedActivityForIntent(
+            @Nullable Intent intent, Context context) {
         // 1. Exit early if the build version doesn't support Android N+ multi-window mode or
         // ChromeTabbedActivity2 isn't running.
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M
@@ -166,7 +168,7 @@ public class MultiWindowUtils implements ActivityStateListener {
         }
 
         // 2. If the intent has a window id set, use that.
-        if (intent.hasExtra(IntentHandler.EXTRA_WINDOW_ID)) {
+        if (intent != null && IntentUtils.safeHasExtra(intent, IntentHandler.EXTRA_WINDOW_ID)) {
             int windowId = IntentUtils.safeGetIntExtra(intent, IntentHandler.EXTRA_WINDOW_ID, 0);
             if (windowId == 1) return ChromeTabbedActivity.class;
             if (windowId == 2) return ChromeTabbedActivity2.class;