chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java - Issue 2277603002: Extract tabbed mode specific logic from the TabPersistenceStore.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

Issue 2277603002: Extract tabbed mode specific logic from the TabPersistenceStore. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix findbugs Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

index f1a25515a6975aea785cd1d81070b43fc246392b..fcd849d19a13f3f9373e053d29b96c7cd74aa50a 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.java

@@ -68,9 +68,10 @@ public class TabModelMergingTest extends ChromeTabbedActivityTestBase {

// Make sure file migrations don't run as they are unnecessary since app data was cleared.

ContextUtils.getAppSharedPreferences().edit().putBoolean(

- TabPersistentStore.PREF_HAS_RUN_FILE_MIGRATION, true).apply();

+ TabbedModeTabPersistencePolicy.PREF_HAS_RUN_FILE_MIGRATION, true).apply();

ContextUtils.getAppSharedPreferences().edit().putBoolean(

- TabPersistentStore.PREF_HAS_RUN_MULTI_INSTANCE_FILE_MIGRATION, true).apply();

+ TabbedModeTabPersistencePolicy.PREF_HAS_RUN_MULTI_INSTANCE_FILE_MIGRATION, true)

+ .apply();

// Some of the logic for when to trigger a merge depends on whether the activity is in

// multi-window mode. Set isInMultiWindowMode to true to avoid merging unexpectedly.