OLD | NEW |
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; | 5 package org.chromium.chrome.browser; |
6 | 6 |
7 import android.content.Context; | 7 import android.content.Context; |
8 import android.support.test.filters.LargeTest; | 8 import android.support.test.filters.LargeTest; |
9 import android.test.MoreAsserts; | 9 import android.test.MoreAsserts; |
10 import android.util.SparseArray; | 10 import android.util.SparseArray; |
11 import android.util.SparseBooleanArray; | 11 import android.util.SparseBooleanArray; |
12 | 12 |
13 import org.chromium.base.ThreadUtils; | 13 import org.chromium.base.ThreadUtils; |
14 import org.chromium.base.test.util.DisabledTest; | 14 import org.chromium.base.test.util.DisabledTest; |
15 import org.chromium.base.test.util.Feature; | 15 import org.chromium.base.test.util.Feature; |
16 import org.chromium.base.test.util.Restriction; | 16 import org.chromium.base.test.util.Restriction; |
17 import org.chromium.base.test.util.RetryOnFailure; | 17 import org.chromium.base.test.util.RetryOnFailure; |
18 import org.chromium.chrome.browser.compositor.layouts.Layout; | 18 import org.chromium.chrome.browser.compositor.layouts.Layout; |
19 import org.chromium.chrome.browser.tab.Tab; | 19 import org.chromium.chrome.browser.tab.Tab; |
20 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator; | 20 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator; |
21 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; | 21 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; |
22 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; | 22 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; |
23 import org.chromium.chrome.browser.tabmodel.TabModelUtils; | 23 import org.chromium.chrome.browser.tabmodel.TabModelUtils; |
24 import org.chromium.chrome.test.ChromeActivityTestCaseBase; | 24 import org.chromium.chrome.test.ChromeActivityTestCaseBase; |
25 import org.chromium.chrome.test.util.ChromeRestriction; | 25 import org.chromium.chrome.test.util.ChromeRestriction; |
26 import org.chromium.chrome.test.util.ChromeTabUtils; | 26 import org.chromium.chrome.test.util.ChromeTabUtils; |
27 import org.chromium.chrome.test.util.PrerenderTestHelper; | 27 import org.chromium.chrome.test.util.PrerenderTestHelper; |
28 import org.chromium.content.browser.BindingManager; | 28 import org.chromium.content.browser.BindingManager; |
29 import org.chromium.content.browser.ChildProcessConnection; | |
30 import org.chromium.content.browser.ChildProcessLauncher; | 29 import org.chromium.content.browser.ChildProcessLauncher; |
| 30 import org.chromium.content.browser.ManagedChildProcessConnection; |
31 import org.chromium.content.browser.test.ChildProcessAllocatorSettings; | 31 import org.chromium.content.browser.test.ChildProcessAllocatorSettings; |
32 import org.chromium.content.browser.test.util.Criteria; | 32 import org.chromium.content.browser.test.util.Criteria; |
33 import org.chromium.content.browser.test.util.CriteriaHelper; | 33 import org.chromium.content.browser.test.util.CriteriaHelper; |
34 import org.chromium.content_public.browser.LoadUrlParams; | 34 import org.chromium.content_public.browser.LoadUrlParams; |
35 import org.chromium.net.test.EmbeddedTestServer; | 35 import org.chromium.net.test.EmbeddedTestServer; |
36 import org.chromium.ui.base.DeviceFormFactor; | 36 import org.chromium.ui.base.DeviceFormFactor; |
37 import org.chromium.ui.base.PageTransition; | 37 import org.chromium.ui.base.PageTransition; |
38 | 38 |
39 import java.util.concurrent.Callable; | 39 import java.util.concurrent.Callable; |
40 | 40 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 synchronized (mVisibilityCallsMap) { | 92 synchronized (mVisibilityCallsMap) { |
93 return mVisibilityCallsMap.get(pid); | 93 return mVisibilityCallsMap.get(pid); |
94 } | 94 } |
95 } | 95 } |
96 | 96 |
97 boolean isReleaseAllModerateBindingsCalled() { | 97 boolean isReleaseAllModerateBindingsCalled() { |
98 return mIsReleaseAllModerateBindingsCalled; | 98 return mIsReleaseAllModerateBindingsCalled; |
99 } | 99 } |
100 | 100 |
101 @Override | 101 @Override |
102 public void addNewConnection(int pid, ChildProcessConnection connection)
{ | 102 public void addNewConnection(int pid, ManagedChildProcessConnection conn
ection) { |
103 synchronized (mVisibilityCallsMap) { | 103 synchronized (mVisibilityCallsMap) { |
104 mVisibilityCallsMap.put(pid, ""); | 104 mVisibilityCallsMap.put(pid, ""); |
105 } | 105 } |
106 } | 106 } |
107 | 107 |
108 @Override | 108 @Override |
109 public void setInForeground(int pid, boolean inForeground) { | 109 public void setInForeground(int pid, boolean inForeground) { |
110 mProcessInForegroundMap.put(pid, inForeground); | 110 mProcessInForegroundMap.put(pid, inForeground); |
111 | 111 |
112 synchronized (mVisibilityCallsMap) { | 112 synchronized (mVisibilityCallsMap) { |
(...skipping 12 matching lines...) Expand all Loading... |
125 } | 125 } |
126 } | 126 } |
127 | 127 |
128 @Override | 128 @Override |
129 public void onSentToBackground() {} | 129 public void onSentToBackground() {} |
130 | 130 |
131 @Override | 131 @Override |
132 public void onBroughtToForeground() {} | 132 public void onBroughtToForeground() {} |
133 | 133 |
134 @Override | 134 @Override |
135 public boolean isOomProtected(int pid) { | 135 public void removeConnection(int pid) {} |
136 return false; | |
137 } | |
138 | |
139 @Override | |
140 public void clearConnection(int pid) {} | |
141 | 136 |
142 @Override | 137 @Override |
143 public void startModerateBindingManagement(Context context, int maxSize)
{} | 138 public void startModerateBindingManagement(Context context, int maxSize)
{} |
144 | 139 |
145 @Override | 140 @Override |
146 public void releaseAllModerateBindings() { | 141 public void releaseAllModerateBindings() { |
147 mIsReleaseAllModerateBindingsCalled = true; | 142 mIsReleaseAllModerateBindingsCalled = true; |
148 } | 143 } |
149 } | 144 } |
150 | 145 |
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
647 super.tearDown(); | 642 super.tearDown(); |
648 } | 643 } |
649 | 644 |
650 /** | 645 /** |
651 * @return the index of the given tab in the current tab model | 646 * @return the index of the given tab in the current tab model |
652 */ | 647 */ |
653 private int indexOf(Tab tab) { | 648 private int indexOf(Tab tab) { |
654 return getActivity().getCurrentTabModel().indexOf(tab); | 649 return getActivity().getCurrentTabModel().indexOf(tab); |
655 } | 650 } |
656 } | 651 } |
OLD | NEW |