[Contextual Search] Fixes ContentView regressions.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.contextualsearch;
 
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ skipping 455 matching lines @@
         }
 
         // If the user is jumping from one unseen search to another search, remove the last search
         // from history.
         PanelState state = mSearchPanelDelegate.getPanelState();
         if (!mWereSearchResultsSeen && mLoadedSearchUrlTimeMs != 0L
                 && state != PanelState.UNDEFINED && state != PanelState.CLOSED) {
             removeLastSearchVisit();
         }
 
-        mSearchPanelDelegate.setSearchContentViewVisibility(false);
-
         boolean isTap = mSelectionController.getSelectionType() == SelectionType.TAP;
         boolean didRequestSurroundings = false;
 
         if (isTap) {
             // If the user action was not a long-press, immediately start loading content.
             mShouldLoadDelayedSearch = false;
         }
 
         if (isTap && mPolicy.shouldPreviousTapResolve(
                 mNetworkCommunicator.getBasePageUrl())) {
@@ skipping 503 matching lines @@
     }
 
     /**
      * @return whether a navigation in the search content view should promote to a separate tab.
      */
     private boolean shouldPromoteSearchNavigation() {
         // A navigation can be due to us loading a URL, or a touch in the search content view.
         // Require a touch, but no recent loading, in order to promote to a separate tab.
         // Note that tapping the opt-in button requires checking for recent loading.
         return mSearchPanelDelegate.didTouchSearchContentView()
-                && !mSearchPanelDelegate.didLoadAnyUrl();
+                && !mSearchPanelDelegate.isProcessingPendingNavigation();
     }
 
     /**
      * Called to check if an external navigation is being done and take the appropriate action:
      * Auto-promotes the panel into a separate tab if that's not already being done.
      * @param url The URL we are navigating to.
      */
     public void onExternalNavigation(String url) {
         mSearchPanelDelegate.updateTopControlState();
 
@@ skipping 210 matching lines @@
 
     private native long nativeInit();
     private native void nativeDestroy(long nativeContextualSearchManager);
     private native void nativeStartSearchTermResolutionRequest(long nativeContextualSearchManager,
             String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
             boolean maySendBasePageUrl);
     private native void nativeGatherSurroundingText(long nativeContextualSearchManager,
             String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
             boolean maySendBasePageUrl);
 }