[Android] Do not restore NTPs from disk unless they are selected.

chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
index bb31280ec3408791eaf0029435339c4c6a88f6fb..062657619d758cb338f06b144e6d8e6900f1818b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
@@ -1805,7 +1805,13 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
     @Feature({"Android-TabSwitcher"})
     @RetryOnFailure
     public void testIncognitoTabsNotRestoredAfterSwipe() throws Exception {
+        mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+        startMainActivityWithURL(mTestServer.getURL(TEST_PAGE_FILE_PATH));
+
         newIncognitoTabFromMenu();
+        // Tab states are not saved for empty NTP tabs, so navigate to any page to trigger a file
+        // to be saved.
+        loadUrl(mTestServer.getURL(TEST_PAGE_FILE_PATH));
 
         File tabStateDir = TabbedModeTabPersistencePolicy.getOrCreateTabbedModeStateDirectory();
         TabModel normalModel = getActivity().getTabModelSelector().getModel(false);
@@ -1839,7 +1845,8 @@ public class TabsTest extends ChromeTabbedActivityTestBase {
                 || getName().equals("testSwitchToTabThatDoesNotHaveThumbnail")
                 || getName().equals("testCloseTabPortrait")
                 || getName().equals("testCloseTabLandscape")
-                || getName().equals("testTabsAreDestroyedOnModelDestruction")) {
+                || getName().equals("testTabsAreDestroyedOnModelDestruction")
+                || getName().equals("testIncognitoTabsNotRestoredAfterSwipe")) {
             return;
         }
         startMainActivityFromLauncher();