Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java |
index d1edfcf0f48d03542f86254d13fdc9a64f2882db..156f52c59ceb81a3ef8e587616c57664df4cfab8 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorTabObserverTest.java |
@@ -9,7 +9,7 @@ import android.test.UiThreadTest; |
import android.test.suitebuilder.annotation.SmallTest; |
import org.chromium.base.CommandLine; |
-import org.chromium.base.ObserverList; |
+import org.chromium.base.RewindableIterator; |
import org.chromium.base.ThreadUtils; |
import org.chromium.chrome.browser.Tab; |
import org.chromium.chrome.browser.TabObserver; |
@@ -211,7 +211,7 @@ public class TabModelSelectorTabObserverTest extends NativeLibraryTestBase { |
// Exists to expose the method to the test. |
@Override |
- protected ObserverList.RewindableIterator<TabObserver> getTabObservers() { |
+ protected RewindableIterator<TabObserver> getTabObservers() { |
return super.getTabObservers(); |
} |
} |
@@ -223,7 +223,7 @@ public class TabModelSelectorTabObserverTest extends NativeLibraryTestBase { |
} |
private void assertTabHasObserver(TestTab tab, TabObserver observer) { |
- ObserverList.RewindableIterator<TabObserver> tabObservers = tab.getTabObservers(); |
+ RewindableIterator<TabObserver> tabObservers = tab.getTabObservers(); |
tabObservers.rewind(); |
boolean containsObserver = false; |
while (tabObservers.hasNext()) { |
@@ -236,7 +236,7 @@ public class TabModelSelectorTabObserverTest extends NativeLibraryTestBase { |
} |
private void assertTabDoesNotHaveObserver(TestTab tab, TabObserver observer) { |
- ObserverList.RewindableIterator<TabObserver> tabObservers = tab.getTabObservers(); |
+ RewindableIterator<TabObserver> tabObservers = tab.getTabObservers(); |
tabObservers.rewind(); |
while (tabObservers.hasNext()) { |
MoreAsserts.assertNotEqual(tabObservers.next(), observer); |