Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3554)

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

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin
Patch Set: Comments Created 4 years, 9 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/java_sources.gni ('k') | ui/android/java/strings/android_ui_strings.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java
index 0e3566d1d23fa956411af32bf246684d1c13d0ba..bceb7535addbdc2b4a93b77477c775c9c1d71958 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java
@@ -210,12 +210,13 @@ public class DocumentModeAssassinTest extends NativeLibraryTestBase {
int numFilesBefore = tabbedModeFilesBefore.length;
assertEquals(0, writeStartedCallback.getCallCount());
assertEquals(0, writeDoneCallback.getCallCount());
+ final Context context = getInstrumentation().getTargetContext();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
public void run() {
assassin.addObserver(observer);
- assassin.writeTabModelMetadata(
- mTabbedModeDirectory.getDataDirectory(), testTabModel, migratedTabIds);
+ assassin.writeTabModelMetadata(testTabModel, migratedTabIds, context,
+ mTabbedModeDirectory.getDataDirectory());
}
});
@@ -231,7 +232,6 @@ public class DocumentModeAssassinTest extends NativeLibraryTestBase {
loadNativeLibraryAndInitBrowserProcess();
TabPersistentStore.setBaseStateDirectory(mTabbedModeDirectory.getBaseDirectory());
- Context context = getInstrumentation().getTargetContext();
TestTabModelSelector selector = new TestTabModelSelector(context);
TabPersistentStore store = selector.mTabPersistentStore;
MockTabPersistentStoreObserver mockObserver = selector.mTabPersistentStoreObserver;
@@ -329,7 +329,8 @@ public class DocumentModeAssassinTest extends NativeLibraryTestBase {
assertEquals(0, copyStartedCallback.getCallCount());
assertEquals(0, copyDoneCallback.getCallCount());
assertEquals(0, copyCallback.getCallCount());
- assassin.copyTabStateFiles(selectedTabId, mDocumentModeDirectory.getDataDirectory(),
+ assassin.copyTabStateFiles(selectedTabId, getInstrumentation().getTargetContext(),
+ mDocumentModeDirectory.getDataDirectory(),
mTabbedModeDirectory.getDataDirectory());
}
});
« no previous file with comments | « chrome/android/java_sources.gni ('k') | ui/android/java/strings/android_ui_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698