Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1642)

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java

Issue 1300903002: Another attempt to unflake CustomTabExternalNavigationTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use isLoading instead of progress Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java
index f3d0e44463efe22190261bf7b83cd06bb48df57e..84461a0fadc33a2e2897074b6303ef20217ac9bb 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabExternalNavigationTest.java
@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.customtabs;
import android.app.Activity;
import android.os.Bundle;
import android.test.FlakyTest;
+import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ThreadUtils;
@@ -51,7 +52,8 @@ public class CustomTabExternalNavigationTest extends CustomTabActivityTestBase {
}
}
- private static final String TEST_URL = "about:blank";
+ private static final String TEST_URL = TestHttpServerClient.getUrl(
+ "chrome/test/data/android/google.html");
private ExternalNavigationHandler mUrlHandler;
private CustomTabNavigationDelegate mNavigationDelegate;
@@ -71,11 +73,8 @@ public class CustomTabExternalNavigationTest extends CustomTabActivityTestBase {
* For urls with special schemes and hosts, and there is exactly one activity having a matching
* intent filter, the framework will make that activity the default handler of the special url.
* This test tests whether chrome is able to start the default external handler.
- *
- * crbug.com/519613
- * @SmallTest
*/
- @FlakyTest
+ @SmallTest
public void testExternalActivityStartedForDefaultUrl() {
final String testUrl = "customtab://customtabtest/intent";
ExternalNavigationParams params = new ExternalNavigationParams.Builder(testUrl, false)
@@ -135,4 +134,4 @@ public class CustomTabExternalNavigationTest extends CustomTabActivityTestBase {
ApplicationStatus.getLastTrackedFocusedActivity() == getActivity());
assertEquals(testUrl, getActivity().getActivityTab().getUrl());
}
-}
+}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698