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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/ContextMenuLoadUrlParamsTest.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, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.tabmodel; 5 package org.chromium.chrome.browser.tabmodel;
6 6
7 import android.os.Environment; 7 import android.os.Environment;
8 import android.test.suitebuilder.annotation.MediumTest; 8 import android.test.suitebuilder.annotation.MediumTest;
9 9
10 import org.chromium.base.ThreadUtils; 10 import org.chromium.base.ThreadUtils;
(...skipping 30 matching lines...) Expand all
41 class RecordingTabModelSelector extends TabModelSelectorImpl { 41 class RecordingTabModelSelector extends TabModelSelectorImpl {
42 @Override 42 @Override
43 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, T ab parent, 43 public Tab openNewTab(LoadUrlParams loadUrlParams, TabLaunchType type, T ab parent,
44 boolean incognito) { 44 boolean incognito) {
45 mOpenNewTabLoadUrlParams = loadUrlParams; 45 mOpenNewTabLoadUrlParams = loadUrlParams;
46 return super.openNewTab(loadUrlParams, type, parent, incognito); 46 return super.openNewTab(loadUrlParams, type, parent, incognito);
47 } 47 }
48 48
49 public RecordingTabModelSelector(ChromeActivity activity, int selectorIn dex, 49 public RecordingTabModelSelector(ChromeActivity activity, int selectorIn dex,
50 WindowAndroid windowAndroid) { 50 WindowAndroid windowAndroid) {
51 super(activity, selectorIndex, windowAndroid); 51 super(activity, new TabbedModeTabPersistencePolicy(activity, selecto rIndex),
52 windowAndroid, true);
52 } 53 }
53 } 54 }
54 55
55 @Override 56 @Override
56 protected void setUp() throws Exception { 57 protected void setUp() throws Exception {
57 // Plant RecordingTabModelSelector as the TabModelSelector used in Main. The factory has to 58 // Plant RecordingTabModelSelector as the TabModelSelector used in Main. The factory has to
58 // be set before super.setUp(), as super.setUp() creates Main and conseq uently the 59 // be set before super.setUp(), as super.setUp() creates Main and conseq uently the
59 // TabModelSelector. 60 // TabModelSelector.
60 ThreadUtils.runOnUiThreadBlocking(new Runnable() { 61 ThreadUtils.runOnUiThreadBlocking(new Runnable() {
61 @Override 62 @Override
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 Tab tab = getActivity().getActivityTab(); 136 Tab tab = getActivity().getActivityTab();
136 ContextMenuUtils.selectContextMenuItem(this, tab, openerDomId, menuItemI d); 137 ContextMenuUtils.selectContextMenuItem(this, tab, openerDomId, menuItemI d);
137 getInstrumentation().waitForIdleSync(); 138 getInstrumentation().waitForIdleSync();
138 } 139 }
139 140
140 @Override 141 @Override
141 public void startMainActivity() throws InterruptedException { 142 public void startMainActivity() throws InterruptedException {
142 startMainActivityOnBlankPage(); 143 startMainActivityOnBlankPage();
143 } 144 }
144 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698