Fix incognito notification/cleanup for android multiwindow.

chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b6a85361622ac64f2a117bf2e036928445f203c2
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java
@@ -0,0 +1,115 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.multiwindow;
+
+import static org.chromium.chrome.browser.multiwindow.MultiWindowUtilsTest.createSecondChromeTabbedActivity;
+
+import android.annotation.TargetApi;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.Build;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import org.chromium.base.ActivityState;
+import org.chromium.base.ApplicationStatus;
+import org.chromium.base.ContextUtils;
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.MinAndroidSdkLevel;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.ChromeTabbedActivity2;
+import org.chromium.chrome.browser.firstrun.FirstRunStatus;
+import org.chromium.chrome.browser.tabmodel.TabWindowManager;
+import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.chrome.test.util.MenuUtils;
+import org.chromium.content.browser.test.util.Criteria;
+import org.chromium.content.browser.test.util.CriteriaHelper;
+
+import java.util.concurrent.Callable;
+
+/**
+ * Integration testing for Android's N+ MultiWindow.
+ */
+@MinAndroidSdkLevel(Build.VERSION_CODES.N)
+public class MultiWindowIntegrationTest extends ChromeTabbedActivityTestBase {
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+
+    @MediumTest
+    @Feature("MultiWindow")
+    @TargetApi(Build.VERSION_CODES.N)
+    @CommandLineFlags.Add(ChromeSwitches.DISABLE_TAB_MERGING_FOR_TESTING)
+    public void testIncognitoNtpHandledCorrectly() throws InterruptedException {
+        try {
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    FirstRunStatus.setFirstRunFlowComplete(true);
+                }
+            });
+
+            newIncognitoTabFromMenu();
+            assertTrue(getActivity().getActivityTab().isIncognito());
+            final int incognitoTabId = getActivity().getActivityTab().getId();
+            final ChromeTabbedActivity2 cta2 = createSecondChromeTabbedActivity(getActivity());
+
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    Context context = ContextUtils.getApplicationContext();
+                    ActivityManager activityManager =
+                            (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+                    for (ActivityManager.AppTask task : activityManager.getAppTasks()) {
+                        if (getActivity().getTaskId() == task.getTaskInfo().id) {
+                            task.moveToFront();
+                            break;
+                        }
+                    }
+                }
+            });
+            CriteriaHelper.pollUiThread(Criteria.equals(ActivityState.RESUMED,
+                    new Callable<Integer>() {
+                        @Override
+                        public Integer call() throws Exception {
+                            return ApplicationStatus.getStateForActivity(getActivity());
+                        }
+                    }));
+
+            MenuUtils.invokeCustomMenuActionSync(
+                    getInstrumentation(), getActivity(), R.id.move_to_other_window_menu_id);
+
+            CriteriaHelper.pollUiThread(Criteria.equals(1,
+                    new Callable<Integer>() {
+                        @Override
+                        public Integer call() throws Exception {
+                            return cta2.getTabModelSelector().getModel(true).getCount();
+                        }
+                    }));
+
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    assertEquals(1, TabWindowManager.getInstance().getIncognitoTabCount());
+
+                    // Ensure the same tab exists in the new activity.
+                    assertEquals(incognitoTabId, cta2.getActivityTab().getId());
+                }
+            });
+        } finally {
+            ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+                @Override
+                public void run() {
+                    FirstRunStatus.setFirstRunFlowComplete(false);
+                }
+            });
+        }
+    }
+
+}