Android: Delete TabImpl.getOriginalUrl()

This CL promotes the method to Tab's public method.

Bug: 995903
Change-Id: I62ddc3d5c05929664aef6bef5b2a03934bcfa868
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2045617
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745305}

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java

@@ -90,7 +90,7 @@ public class TabContext {
         public static TabInfo createFromTab(Tab tab) {
             String referrerUrl = getReferrerUrlFromTab(tab);
             return new TabInfo(tab.getId(), tab.getTitle(), tab.getUrlString(),
-                    ((TabImpl) tab).getOriginalUrl(), referrerUrl != null ? referrerUrl : "",
+                    tab.getOriginalUrl(), referrerUrl != null ? referrerUrl : "",
                     tab.getTimestampMillis(), ((TabImpl) tab).getProfile(), tab.getUrlString());
         }
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

@@ -29,7 +29,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
@@ -70,8 +69,8 @@ public class BookmarkUtils {
             return bookmarkId;
         }
 
-        BookmarkId bookmarkId = addBookmarkInternal(
-                activity, bookmarkModel, tab.getTitle(), ((TabImpl) tab).getOriginalUrl());
+        BookmarkId bookmarkId =
+                addBookmarkInternal(activity, bookmarkModel, tab.getTitle(), tab.getOriginalUrl());
 
         Snackbar snackbar = null;
         if (bookmarkId == null) {

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -112,6 +112,12 @@ public interface Tab extends TabLifecycle {
      */
     GURL getUrl();
 
+    /**
+     * @return Original url of the tab without any Chrome feature modifications applied
+     *         (e.g. reader mode).
+     */
+    String getOriginalUrl();
+
     /**
      * @return The tab title.
      */

chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java

@@ -368,6 +368,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
         return mUrl != null ? mUrl : GURL.emptyGURL();
     }
 
+    @Override
+    public String getOriginalUrl() {
+        return DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(getUrlString());
+    }
+
     @CalledByNative
     @Override
     public String getTitle() {
@@ -724,13 +729,6 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
         return mRootId;
     }
 
-    /**
-     * @return Original url of the tab, which is the original url from DOMDistiller.
-     */
-    public String getOriginalUrl() {
-        return DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(getUrlString());
-    }
-
     /**
      * @return Whether or not the {@link Tab} is currently showing an interstitial page, such as
      *         a bad HTTPS page.

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

@@ -181,7 +181,7 @@ public class LocationBarModel implements ToolbarDataProvider, ToolbarCommonPrope
         }
 
         if (isOfflinePage()) {
-            String originalUrl = ((TabImpl) mTab).getOriginalUrl();
+            String originalUrl = mTab.getOriginalUrl();
             formattedUrl = UrlUtilities.stripScheme(
                     DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl));
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java

@@ -59,7 +59,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
 import org.chromium.chrome.browser.page_info.PageInfoController;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TrustedCdn;
 import org.chromium.chrome.browser.toolbar.ToolbarColors;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
@@ -535,7 +534,7 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
         if (v == mTitleUrlContainer) {
             Tab tab = getCurrentTab();
             if (tab == null) return false;
-            Clipboard.getInstance().copyUrlToClipboard(((TabImpl) tab).getOriginalUrl());
+            Clipboard.getInstance().copyUrlToClipboard(tab.getOriginalUrl());
             return true;
         }
         return false;

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationManager.java

@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.PendingIntentProvider;
 import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.ui.base.Clipboard;
 
 import java.lang.ref.WeakReference;
@@ -177,7 +176,7 @@ class WebappActionsNotificationManager implements PauseResumeWithNativeObserver
         } else if (ACTION_FOCUS.equals(intent.getAction())) {
             Tab tab = webappActivity.getActivityTab();
             if (tab != null) {
-                Clipboard.getInstance().copyUrlToClipboard(((TabImpl) tab).getOriginalUrl());
+                Clipboard.getInstance().copyUrlToClipboard(tab.getOriginalUrl());
             }
             RecordUserAction.record("Webapp.NotificationFocused");
             return true;

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -47,7 +47,6 @@ import org.chromium.chrome.browser.metrics.WebApkUma;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.usage_stats.UsageStatsService;
 import org.chromium.chrome.browser.util.AndroidTaskUtils;
@@ -520,7 +519,7 @@ public class WebappActivity extends BaseCustomTabActivity<WebappActivityComponen
         Tab tab = getActivityTab();
         if (tab == null) return false;
 
-        String url = ((TabImpl) tab).getOriginalUrl();
+        String url = tab.getOriginalUrl();
         if (TextUtils.isEmpty(url)) {
             url = IntentHandler.getUrlFromIntent(getIntent());
         }