HTTPS Server Previews: Show the original URL on Android while pending

While a navigation is pending, show the original URL if the browser is
navigating to the previews server.

Reworks the GetOriginal APIs in the Previews bridge to support a plain-
string impl since checking for a committed preview won't work while the
navigation is pending.

Bug: 894881
Change-Id: Ic8ffd3e16b270dd69efb7a62128265629a5b9de2
Reviewed-on: https://chromium-review.googlesource.com/c/1330761Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Doug Arnett <dougarnett@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607352}

chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoController.java

@@ -341,7 +341,8 @@ public class PageInfoController
                     bridge.loadOriginal(mTab.getWebContents());
                 });
             };
-            final String previewOriginalHost = bridge.getOriginalHost(mTab.getWebContents());
+            final String previewOriginalHost =
+                    bridge.getOriginalHost(mTab.getWebContents().getVisibleUrl());
             final String loadOriginalText = mContext.getString(
                     R.string.page_info_preview_load_original, previewOriginalHost);
             final SpannableString loadOriginalSpan = SpanApplier.applySpans(loadOriginalText,

chrome/android/java/src/org/chromium/chrome/browser/previews/PreviewsAndroidBridge.java

@@ -6,6 +6,9 @@ package org.chromium.chrome.browser.previews;
 
 import org.chromium.content_public.browser.WebContents;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 /**
  * Java bridge class to C++ Previews code.
  */
@@ -30,11 +33,25 @@ public final class PreviewsAndroidBridge {
     }
 
     /**
-     * Returns the origin host name of the preview being shown.
+     * Returns the original host name for visibleURL. This should only be used on preview pages.
      */
-    public String getOriginalHost(WebContents webContents) {
-        assert shouldShowPreviewUI(webContents) : "getOriginalHost called on a non-preview page";
-        return nativeGetOriginalHost(mNativePreviewsAndroidBridge, webContents);
+    public String getOriginalHost(String visibleURL) {
+        try {
+            return new URI(getOriginalURL(visibleURL)).getHost();
+        } catch (URISyntaxException e) {
+        }
+        return "";
+    }
+
+    /**
+     * Returns the original URL of the given visible URL if the given URL is for a HTTPS Server
+     * Preview. Otherwise, the given visibleURL is returned.
+     */
+    public String getOriginalURL(String visibleURL) {
+        final String originalURL =
+                nativeGetLitePageRedirectOriginalURL(mNativePreviewsAndroidBridge, visibleURL);
+        if (originalURL == null) return visibleURL;
+        return originalURL;
     }
 
     /**
@@ -65,8 +82,8 @@ public final class PreviewsAndroidBridge {
     private native long nativeInit();
     private native boolean nativeShouldShowPreviewUI(
             long nativePreviewsAndroidBridge, WebContents webContents);
-    private native String nativeGetOriginalHost(
-            long nativePreviewsAndroidBridge, WebContents webContents);
+    private native String nativeGetLitePageRedirectOriginalURL(
+            long nativePreviewsAndroidBridge, String visibleURL);
     private native String nativeGetStalePreviewTimestamp(
             long nativePreviewsAndroidBridge, WebContents webContents);
     private native void nativeLoadOriginal(

chrome/android/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;
 import org.chromium.chrome.browser.omnibox.QueryInOmnibox;
 import org.chromium.chrome.browser.omnibox.UrlBarData;
+import org.chromium.chrome.browser.previews.PreviewsAndroidBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.ColorUtils;
@@ -162,8 +163,18 @@ public class LocationBarModel implements ToolbarDataProvider {
             return buildUrlBarData(url, formattedUrl);
         }
 
+        // A preview URL may be shown before commit when isPreview() would first return true. Always
+        // check if the visible URL is a preview, and if so, rewrite it.
+        final String previewsOriginalURL = PreviewsAndroidBridge.getInstance().getOriginalURL(url);
+        if (!previewsOriginalURL.equals(url)) {
+            // Strip the scheme if this is a committed preview.
+            return buildUrlBarData(previewsOriginalURL,
+                    isPreview() ? UrlUtilities.stripScheme(previewsOriginalURL)
+                                : previewsOriginalURL);
+        }
+
+        // Strip the scheme from committed preview pages only.
         if (isPreview()) {
-            // Strip the scheme from the original URL for the Previews UI.
             return buildUrlBarData(url, UrlUtilities.stripScheme(url));
         }
 

chrome/browser/previews/android/previews_android_bridge.cc

@@ -50,26 +50,19 @@ jboolean PreviewsAndroidBridge::ShouldShowPreviewUI(
 }
 
 base::android::ScopedJavaLocalRef<jstring>
-PreviewsAndroidBridge::GetOriginalHost(
+PreviewsAndroidBridge::GetLitePageRedirectOriginalURL(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& obj,
-    const base::android::JavaParamRef<jobject>& j_web_contents) {
-  content::WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(j_web_contents);
-  if (!web_contents)
-    return base::android::ScopedJavaLocalRef<jstring>();
-
-  GURL visible_url = web_contents->GetVisibleURL();
-
+    const base::android::JavaParamRef<jstring>& j_visible_url) {
+  GURL visible_url(base::android::ConvertJavaStringToUTF16(env, j_visible_url));
   std::string original_url;
   if (PreviewsLitePageNavigationThrottle::GetOriginalURL(visible_url,
                                                          &original_url)) {
     return base::android::ScopedJavaLocalRef<jstring>(
-        base::android::ConvertUTF8ToJavaString(env, GURL(original_url).host()));
+        base::android::ConvertUTF8ToJavaString(env, original_url));
   }
 
-  return base::android::ScopedJavaLocalRef<jstring>(
-      base::android::ConvertUTF8ToJavaString(env, visible_url.host()));
+  return nullptr;
 }
 
 base::android::ScopedJavaLocalRef<jstring>

chrome/browser/previews/android/previews_android_bridge.h

@@ -23,10 +23,10 @@ class PreviewsAndroidBridge {
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& j_web_contents);
 
-  base::android::ScopedJavaLocalRef<jstring> GetOriginalHost(
+  base::android::ScopedJavaLocalRef<jstring> GetLitePageRedirectOriginalURL(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jobject>& j_web_contents);
+      const base::android::JavaParamRef<jstring>& j_visisble_url);
 
   base::android::ScopedJavaLocalRef<jstring> GetStalePreviewTimestamp(
       JNIEnv* env,