Fix incognito tabs persisting when cct service is active

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
index 2d4ee4e161a61f347c3bf3815c41df0a733734c0..9335954ac6f2058c84e441814b4bd2f0964edfae 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
@@ -282,7 +282,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
         assertNull(store.mPrefetchActiveTabTask);
 
         // Make sure the metadata file loads properly and in order.
-        store.loadState();
+        store.loadState(false /* ignoreIncognitoFiles */);
         mockObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup);
 
@@ -325,7 +325,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
         MockTabPersistentStoreObserver firstObserver = new MockTabPersistentStoreObserver();
         final TabPersistentStore firstStore = new TabPersistentStore(
                 firstSelector, 0, mAppContext, firstManager, firstObserver, false);
-        firstStore.loadState();
+        firstStore.loadState(false /* ignoreIncognitoFiles */);
         firstObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, firstObserver.mTabCountAtStartup);
         firstObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs);
@@ -349,7 +349,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
         // Make sure that all of the Tabs appear in the new one -- even though the new file was
         // written before the first TabPersistentStore loaded any TabState files and added them to
         // the TabModels.
-        secondStore.loadState();
+        secondStore.loadState(false /* ignoreIncognitoFiles */);
         secondObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, secondObserver.mTabCountAtStartup);
 
@@ -404,7 +404,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
                 mockSelector, 0, mAppContext, mockManager, mockObserver, false);
 
         // Make sure the metadata file loads properly and in order.
-        store.loadState();
+        store.loadState(false /* ignoreIncognitoFiles */);
         mockObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup);
 
@@ -447,7 +447,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
                 mockSelector, 0, mAppContext, mockManager, mockObserver, false);
 
         // Load the TabModel metadata.
-        store.loadState();
+        store.loadState(false /* ignoreIncognitoFiles */);
         mockObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup);
         mockObserver.detailsReadCallback.waitForCallback(0, numExpectedTabs);
@@ -482,7 +482,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
 
         assertNotNull(store.mPrefetchActiveTabTask);
 
-        store.loadState();
+        store.loadState(false /* ignoreIncognitoFiles */);
         store.restoreTabs(true);
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ -578,7 +578,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
 
         // Load up the TabModel metadata.
         int numExpectedTabs = info.numRegularTabs + info.numIncognitoTabs;
-        store.loadState();
+        store.loadState(false /* ignoreIncognitoFiles */);
         mockObserver.initializedCallback.waitForCallback(0, 1);
         assertEquals(numExpectedTabs, mockObserver.mTabCountAtStartup);
         mockObserver.detailsReadCallback.waitForCallback(0, info.contents.length);