| 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.tab; | 5 package org.chromium.chrome.browser.tab; |
| 6 | 6 |
| 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
ND_DEVICE; | 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
ND_DEVICE; |
| 8 | 8 |
| 9 import android.test.suitebuilder.annotation.LargeTest; | 9 import android.support.test.filters.LargeTest; |
| 10 | 10 |
| 11 import org.chromium.base.ThreadUtils; | 11 import org.chromium.base.ThreadUtils; |
| 12 import org.chromium.base.test.util.Restriction; | 12 import org.chromium.base.test.util.Restriction; |
| 13 import org.chromium.base.test.util.RetryOnFailure; | 13 import org.chromium.base.test.util.RetryOnFailure; |
| 14 import org.chromium.base.test.util.UrlUtils; | 14 import org.chromium.base.test.util.UrlUtils; |
| 15 import org.chromium.chrome.browser.snackbar.SnackbarManager; | 15 import org.chromium.chrome.browser.snackbar.SnackbarManager; |
| 16 import org.chromium.chrome.browser.tabmodel.TabModel; | 16 import org.chromium.chrome.browser.tabmodel.TabModel; |
| 17 import org.chromium.chrome.browser.tabmodel.TabModelUtils; | 17 import org.chromium.chrome.browser.tabmodel.TabModelUtils; |
| 18 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; | 18 import org.chromium.chrome.test.ChromeTabbedActivityTestBase; |
| 19 import org.chromium.content.browser.test.util.Criteria; | 19 import org.chromium.content.browser.test.util.Criteria; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 public boolean isSatisfied() { | 80 public boolean isSatisfied() { |
| 81 return !model.isClosurePending(tab.getId()) && model.getCount()
== 0; | 81 return !model.isClosurePending(tab.getId()) && model.getCount()
== 0; |
| 82 } | 82 } |
| 83 }); | 83 }); |
| 84 | 84 |
| 85 // Validate that the model doesn't contain the original tab or any newly
opened tabs. | 85 // Validate that the model doesn't contain the original tab or any newly
opened tabs. |
| 86 assertFalse("Model is still waiting to close the tab", model.isClosurePe
nding(tab.getId())); | 86 assertFalse("Model is still waiting to close the tab", model.isClosurePe
nding(tab.getId())); |
| 87 assertEquals("Model still has tabs", 0, model.getCount()); | 87 assertEquals("Model still has tabs", 0, model.getCount()); |
| 88 } | 88 } |
| 89 } | 89 } |
| OLD | NEW |