Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/OriginVerifier.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/OriginVerifier.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/OriginVerifier.java |
index 34a9a84d20dc2c612ae80b03dbe3d19e13e54d6f..b7c6ba4a3dbd0868bec566fd0e1b4674832cc9b6 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/OriginVerifier.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/OriginVerifier.java |
@@ -17,6 +17,7 @@ import org.chromium.base.annotations.CalledByNative; |
import org.chromium.base.annotations.JNINamespace; |
import org.chromium.base.library_loader.LibraryProcessType; |
import org.chromium.chrome.browser.IntentHandler; |
+import org.chromium.chrome.browser.UrlConstants; |
import org.chromium.chrome.browser.profiles.Profile; |
import org.chromium.content.browser.BrowserStartupController; |
@@ -29,6 +30,7 @@ import java.security.cert.CertificateException; |
import java.security.cert.CertificateFactory; |
import java.security.cert.X509Certificate; |
import java.util.HashMap; |
+import java.util.Locale; |
import java.util.Map; |
/** |
@@ -109,6 +111,15 @@ class OriginVerifier { |
public void start(@NonNull Uri origin) { |
ThreadUtils.assertOnUiThread(); |
mOrigin = origin; |
+ if (!UrlConstants.HTTPS_SCHEME.equals(mOrigin.getScheme().toLowerCase(Locale.US))) { |
+ ThreadUtils.postOnUiThread(new Runnable() { |
+ @Override |
+ public void run() { |
+ originVerified(false); |
+ } |
+ }); |
+ return; |
+ } |
// If this origin is cached as verified already, use that. |
Uri cachedOrigin = getCachedOriginIfExists(); |