| Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
|
| diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
|
| index f14c28e83acfd400741ac6fc6dc6aa57eaea60e4..11efcc2177c8669bf280874fa05271295fcf9f09 100644
|
| --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
|
| +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
|
| @@ -15,6 +15,7 @@ import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.content.browser.test.util.Criteria;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| +import org.chromium.ui.base.PageTransition;
|
|
|
| import java.util.Locale;
|
|
|
| @@ -63,10 +64,20 @@ public class TabLoadObserver extends EmptyTabObserver {
|
| * @param url URL to load and wait for.
|
| */
|
| public void fullyLoadUrl(final String url) throws Exception {
|
| + fullyLoadUrl(url, PageTransition.LINK);
|
| + }
|
| +
|
| + /**
|
| + * Loads the given URL and waits for it to complete.
|
| + *
|
| + * @param url URL to load and wait for.
|
| + * @param transitionType the transition type to use.
|
| + */
|
| + public void fullyLoadUrl(final String url, final int transitionType) throws Exception {
|
| ThreadUtils.runOnUiThread(new Runnable() {
|
| @Override
|
| public void run() {
|
| - mTab.loadUrl(new LoadUrlParams(url));
|
| + mTab.loadUrl(new LoadUrlParams(url, transitionType));
|
| }
|
| });
|
| assertLoaded();
|
|
|