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 5e31b7d6d978fb85d5ec4fdc3b3f245492e4e776..d59781d58c7c310ae4545ea8160bae8a7656946a 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 |
@@ -71,7 +71,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
public int idOfFirstCreatedTab = Tab.INVALID_TAB_ID; |
public MockTabCreator(boolean incognito, TabModelSelector selector) { |
- created = new SparseArray<TabState>(); |
+ created = new SparseArray<>(); |
callback = new CallbackHelper(); |
mIsIncognito = incognito; |
mSelector = selector; |
@@ -152,9 +152,9 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
@Override |
public TabPersistentStore call() { |
TabPersistencePolicy persistencePolicy = |
- new TabbedModeTabPersistencePolicy(context, 0); |
+ new TabbedModeTabPersistencePolicy(0); |
return new TabPersistentStore( |
- persistencePolicy, TestTabModelSelector.this, context, |
+ persistencePolicy, TestTabModelSelector.this, |
mTabCreatorManager, mTabPersistentStoreObserver, true); |
} |
}); |
@@ -216,7 +216,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
public final CallbackHelper stateLoadedCallback = new CallbackHelper(); |
public final CallbackHelper stateMergedCallback = new CallbackHelper(); |
public final CallbackHelper listWrittenCallback = new CallbackHelper(); |
- public final ArrayList<TabRestoredDetails> details = new ArrayList<TabRestoredDetails>(); |
+ public final ArrayList<TabRestoredDetails> details = new ArrayList<>(); |
public int mTabCountAtStartup = -1; |
@@ -235,7 +235,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
} |
@Override |
- public void onStateLoaded(Context context) { |
+ public void onStateLoaded() { |
stateLoadedCallback.notifyCalled(); |
} |
@@ -308,8 +308,8 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<TabPersistentStore>() { |
@Override |
public TabPersistentStore call() throws Exception { |
- return new TabPersistentStore(persistencePolicy, modelSelector, mAppContext, |
- creatorManager, observer, false); |
+ return new TabPersistentStore(persistencePolicy, modelSelector, creatorManager, |
+ observer, false); |
} |
}); |
} |
@@ -327,7 +327,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabCreator regularCreator = mockManager.getTabCreator(false); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(mAppContext, 0); |
+ TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0); |
TabPersistentStore store = buildTabPersistentStore( |
persistencePolicy, mockSelector, mockManager, mockObserver); |
@@ -376,8 +376,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabModelSelector firstSelector = new MockTabModelSelector(0, 0, null); |
MockTabCreatorManager firstManager = new MockTabCreatorManager(firstSelector); |
MockTabPersistentStoreObserver firstObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy firstPersistencePolicy = new TabbedModeTabPersistencePolicy( |
- mAppContext, 0); |
+ TabPersistencePolicy firstPersistencePolicy = new TabbedModeTabPersistencePolicy(0); |
final TabPersistentStore firstStore = buildTabPersistentStore( |
firstPersistencePolicy, firstSelector, firstManager, firstObserver); |
firstStore.loadState(false /* ignoreIncognitoFiles */); |
@@ -397,8 +396,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabCreatorManager secondManager = new MockTabCreatorManager(secondSelector); |
MockTabCreator secondCreator = secondManager.getTabCreator(false); |
MockTabPersistentStoreObserver secondObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy secondPersistencePolicy = new TabbedModeTabPersistencePolicy( |
- mAppContext, 0); |
+ TabPersistencePolicy secondPersistencePolicy = new TabbedModeTabPersistencePolicy(0); |
TabPersistentStore secondStore = buildTabPersistentStore( |
secondPersistencePolicy, secondSelector, secondManager, secondObserver); |
@@ -458,7 +456,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabModelSelector mockSelector = new MockTabModelSelector(0, 0, null); |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(mAppContext, 0); |
+ TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0); |
TabPersistentStore store = buildTabPersistentStore( |
persistencePolicy, mockSelector, mockManager, mockObserver); |
@@ -502,7 +500,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabModelSelector mockSelector = new MockTabModelSelector(0, 0, null); |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(mAppContext, 0); |
+ TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0); |
TabPersistentStore store = buildTabPersistentStore( |
persistencePolicy, mockSelector, mockManager, mockObserver); |
@@ -537,7 +535,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
MockTabModelSelector mockSelector = new MockTabModelSelector(0, 0, null); |
MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector); |
MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver(); |
- TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(mAppContext, 0); |
+ TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0); |
final TabPersistentStore store = buildTabPersistentStore( |
persistencePolicy, mockSelector, mockManager, mockObserver); |
store.waitForMigrationToFinish(); |
@@ -695,7 +693,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase { |
private void closeAllTabsThenUndo(TabModelSelector selector, TabModelMetaDataInfo info) { |
// Close all the tabs, using an Observer to determine what is actually being closed. |
TabModel regularModel = selector.getModel(false); |
- final List<Integer> closedTabIds = new ArrayList<Integer>(); |
+ final List<Integer> closedTabIds = new ArrayList<>(); |
TabModelObserver closeObserver = new EmptyTabModelObserver() { |
@Override |
public void allTabsPendingClosure(List<Integer> tabIds) { |