Make Contextual Search work in chrome custom tabs

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 529bf77796427573994a808c4bfbe2dda875ae69..80cabc746ae9438dd84c677e9ccf4c509d5cb3b5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -33,7 +33,9 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
+import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.NavigationEntry;
 
 /**
  * The activity for custom tabs. It will be launched on top of a client's task.
@@ -256,6 +258,17 @@ public class CustomTabActivity extends ChromeActivity {
     }
 
     @Override
+    public boolean createContextualSearchTab(ContentViewCore searchContentViewCore) {
+        if (mTab == null) return false;
+        NavigationEntry entry =
+                searchContentViewCore.getWebContents().getNavigationController().getPendingEntry();
+        String url = entry != null
+                ? entry.getUrl() : searchContentViewCore.getWebContents().getUrl();
+        mTab.loadUrl(new LoadUrlParams(url));
+        return false;
+    }
+
+    @Override
     public SingleTabModelSelector getTabModelSelector() {
         return (SingleTabModelSelector) super.getTabModelSelector();
     }