[Android] Fix refresh keyboard shortcut behavior.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 585e9db9bd4dabcb80da51f5545477d9e4a64e40..3623b757b8e32a834c28c8e4b4794ab6846636ff 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -67,8 +67,6 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.WebsiteSettingsPopup;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.appmenu.AppMenuButtonHelper;
-import org.chromium.chrome.browser.dom_distiller.DomDistillerServiceFactory;
-import org.chromium.chrome.browser.dom_distiller.DomDistillerTabUtils;
 import org.chromium.chrome.browser.ntp.NativePageFactory;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.ntp.NewTabPage.FakeboxDelegate;
@@ -96,8 +94,6 @@ import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.KeyNavigationUtil;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.TintedImageButton;
-import org.chromium.components.dom_distiller.core.DomDistillerService;
-import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.accessibility.BrowserAccessibilityManager;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -918,6 +914,21 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
     }
 
     @Override
+    public void revertChanges() {
+        if (!mUrlHasFocus) {
+            setUrlToPageUrl();
+        } else {
+            Tab tab = mToolbarDataProvider.getTab();
+            if (NativePageFactory.isNativePageUrl(tab.getUrl(), tab.isIncognito())) {
+                mUrlBar.setUrl("", null);
+            } else {
+                mUrlBar.setUrl(
+                        mToolbarDataProvider.getText(), mToolbarDataProvider.getTab().getUrl());
+            }
+        }
+    }
+
+    @Override
     public long getFirstUrlBarFocusTime() {
         return mUrlBar.getFirstFocusTime();
     }
@@ -1297,14 +1308,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
         findViewById(R.id.location_bar_icon).setVisibility(showContainer ? VISIBLE : GONE);
     }
 
-    private boolean isStoredArticle(String url) {
-        DomDistillerService domDistillerService =
-                DomDistillerServiceFactory.getForProfile(Profile.getLastUsedProfile());
-        String entryIdFromUrl = DomDistillerUrlUtils.getValueForKeyInUrl(url, "entry_id");
-        if (TextUtils.isEmpty(entryIdFromUrl)) return false;
-        return domDistillerService.hasEntry(entryIdFromUrl);
-    }
-
     /**
      * Updates the layout params for the location bar start aligned views.
      */
@@ -1960,12 +1963,15 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
 
         boolean showingQuery = false;
         String displayText = mToolbarDataProvider.getText();
-        int securityLevel = getSecurityLevel();
-        if (securityLevel != ConnectionSecurityLevel.SECURITY_ERROR
-                && !TextUtils.isEmpty(displayText) && mToolbarDataProvider.wouldReplaceURL()) {
-            url = displayText.trim();
-            showingQuery = true;
-            mQueryInTheOmnibox = true;
+        if (!TextUtils.isEmpty(displayText) && mToolbarDataProvider.wouldReplaceURL()) {
+            if (getSecurityLevel() == ConnectionSecurityLevel.SECURITY_ERROR) {
+                assert false : "Search terms should not be shown for https error pages.";
+                displayText = url;
+            } else {
+                url = displayText.trim();
+                showingQuery = true;
+                mQueryInTheOmnibox = true;
+            }
         }
         String path = null;
         if (!showingQuery && FeatureUtilities.isDocumentMode(getContext())) {
@@ -1974,21 +1980,6 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
             path = urlText.second;
         }
 
-        if (DomDistillerUrlUtils.isDistilledPage(url)) {
-            if (isStoredArticle(url)) {
-                DomDistillerService domDistillerService =
-                        DomDistillerServiceFactory.getForProfile(profile);
-                String originalUrl = domDistillerService.getUrlForEntry(
-                        DomDistillerUrlUtils.getValueForKeyInUrl(url, "entry_id"));
-                displayText =
-                        DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl);
-            } else if (DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url) != null) {
-                String originalUrl = DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(url);
-                displayText =
-                        DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl);
-            }
-        }
-
         if (setUrlBarText(displayText, path, url)) {
             mUrlBar.deEmphasizeUrl();
             emphasizeUrl();