Enable captive portal interstitial on Android
Captive portal interstitial is currently only compiled if
ENABLE_CAPTIVE_PORTAL_DETECTION is present. This flag enables Chrome's
own captive portal detection and is off on Android. However, we still
want to be able to display a captive portal interstitial on Android, by
way of checking the certificates served by portals.
For that reason, this CL enables the captive portal interstitial on Android
and uses the CaptivePortalCertificateList feature to detect captive portal
related certificates. It also adds a Java test for the new interstitial.
Bug: 642993
Change-Id: I6be15ce10a5039fb1b1d8da0e7ef2f2c27dc48b4
Reviewed-on: https://chromium-review.googlesource.com/661795
Commit-Queue: Mustafa Emre Acer <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Reviewed-by: Emily Stark <[email protected]>
Reviewed-by: Matt Mueller <[email protected]>
Cr-Commit-Position: refs/heads/master@{#504457}diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index ab09d1d..c1de1ab 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -1039,6 +1039,7 @@
"java/src/org/chromium/chrome/browser/snackbar/TemplatePreservingTextView.java",
"java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java",
"java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java",
+ "java/src/org/chromium/chrome/browser/ssl/CaptivePortalHelper.java",
"java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java",
"java/src/org/chromium/chrome/browser/suggestions/ContextualSuggestionsCardViewHolder.java",
"java/src/org/chromium/chrome/browser/suggestions/DestructionObserver.java",
@@ -1660,6 +1661,7 @@
"javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarkNodeUnitTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java",
+ "javatests/src/org/chromium/chrome/browser/ssl/CaptivePortalTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java",
"javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
