[Contextual Search] Fix history removal regression.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
index 8a48802d3eaf3ec6ded1e6ef9845e3ab3f3aa4b2..e2ea990b9d4ba826a11731ed4e7c689708ecca28 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
@@ -127,6 +127,7 @@ public class ContextualSearchManager extends ContextualSearchObservable
     // text, and make sure that all states are cleared when starting a new contextual search to
     // avoid having the values in a funky state.
     private ContextualSearchRequest mSearchRequest;
+    private ContextualSearchRequest mLastSearchRequestLoaded;
 
     // The native manager associated with this object.
     private long mNativeContextualSearchManagerPtr;
@@ -743,6 +744,7 @@ public class ContextualSearchManager extends ContextualSearchObservable
      */
     private void loadSearchUrl() {
         mLoadedSearchUrlTimeMs = System.currentTimeMillis();
+        mLastSearchRequestLoaded = mSearchRequest;
         mSearchPanelDelegate.loadUrlInPanel(mSearchRequest.getSearchUrl());
         mDidStartLoadingResolvedSearchRequest = true;
 
@@ -912,8 +914,9 @@ public class ContextualSearchManager extends ContextualSearchObservable
      * Removes the last resolved search URL from the Chrome history.
      */
     private void removeLastSearchVisit() {
-        if (mSearchRequest != null) {
-            mSearchPanelDelegate.removeLastHistoryEntry(mSearchRequest.getSearchUrl(),
+        if (mLastSearchRequestLoaded != null) {
+            // TODO(pedrosimonetti): Consider having this feature builtin into OverlayPanelContent.
+            mSearchPanelDelegate.removeLastHistoryEntry(mLastSearchRequestLoaded.getSearchUrl(),
                     mLoadedSearchUrlTimeMs);
         }
     }