Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java |
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java |
index 36c78314b3b362970f8db2c4a61e9564ed5eb558..12f4fa3b71a308fea263ef413f065f9ea0e669d0 100644 |
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java |
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java |
@@ -23,11 +23,11 @@ public class HistoryUtils { |
protected static final long WAIT_TIMEOUT_SECONDS = scaleTimeout(15); |
/** |
- * Calls {@link ContentViewCore#canGoBack()} on UI thread. |
+ * Calls {@link NavigationController#canGoBack()} on UI thread. |
* |
* @param instrumentation an Instrumentation instance. |
* @param contentViewCore a ContentViewCore instance. |
- * @return result of {@link ContentViewCore#canGoBack()} |
+ * @return result of {@link NavigationController#canGoBack()} |
* @throws Throwable |
*/ |
public static boolean canGoBackOnUiThread(Instrumentation instrumentation, |
@@ -42,13 +42,13 @@ public class HistoryUtils { |
} |
/** |
- * Calls {@link ContentViewCore#canGoToOffset(int)} on UI thread. |
+ * Calls {@link NavigationController#canGoToOffset(int)} on UI thread. |
* |
* @param instrumentation an Instrumentation instance. |
* @param contentViewCore a ContentViewCore instance. |
* @param offset The number of steps to go on the UI thread, with negative |
* representing going back. |
- * @return result of {@link ContentViewCore#canGoToOffset(int)} |
+ * @return result of {@link NavigationController#canGoToOffset(int)} |
* @throws Throwable |
*/ |
public static boolean canGoToOffsetOnUiThread(Instrumentation instrumentation, |
@@ -63,11 +63,11 @@ public class HistoryUtils { |
} |
/** |
- * Calls {@link ContentViewCore#canGoForward()} on UI thread. |
+ * Calls {@link NavigationController#canGoForward()} on UI thread. |
* |
* @param instrumentation an Instrumentation instance. |
* @param contentViewCore a ContentViewCore instance. |
- * @return result of {@link ContentViewCore#canGoForward()} |
+ * @return result of {@link NavigationController#canGoForward()} |
* @throws Throwable |
*/ |
public static boolean canGoForwardOnUiThread(Instrumentation instrumentation, |
@@ -82,7 +82,7 @@ public class HistoryUtils { |
} |
/** |
- * Calls {@link ContentViewCore#clearHistory()} on UI thread. |
+ * Calls {@link NavigationController#clearHistory()} on UI thread. |
* |
* @param instrumentation an Instrumentation instance. |
* @param contentViewCore a ContentViewCore instance. |
@@ -99,7 +99,7 @@ public class HistoryUtils { |
} |
/** |
- * Calls {@link ContentViewCore#getUrl()} on UI Thread to get the current URL. |
+ * Calls {@link NavigationController#getUrl()} on UI Thread to get the current URL. |
* |
* @param instrumentation an Instrumentation instance. |
* @param contentViewCore a ContentViewCore instance. |
@@ -118,32 +118,6 @@ public class HistoryUtils { |
} |
/** |
- * Performs navigation in the history on UI thread and waits until |
- * onPageFinished is called. |
- * |
- * @param instrumentation an Instrumentation instance. |
- * @param contentViewCore a ContentViewCore instance. |
- * @param onPageFinishedHelper the CallbackHelper instance associated with the onPageFinished |
- * callback of contentViewCore. |
- * @param offset |
- * @throws Throwable |
- */ |
- public static void goToOffsetSync(Instrumentation instrumentation, |
- final WebContents webContents, CallbackHelper onPageFinishedHelper, |
- final int offset) throws Throwable { |
- int currentCallCount = onPageFinishedHelper.getCallCount(); |
- instrumentation.runOnMainSync(new Runnable() { |
- @Override |
- public void run() { |
- webContents.getNavigationController().goToOffset(offset); |
- } |
- }); |
- |
- // Wait for onPageFinished event or timeout after 30s |
- onPageFinishedHelper.waitForCallback(currentCallCount, 1, 30, TimeUnit.SECONDS); |
- } |
- |
- /** |
* Goes back on UI thread and waits until onPageFinished is called or until |
* it times out. |
* |