Revert of Disable search functionality in ChromeActivity before search promo check

Revert of Disable search functionality in ChromeActivity before search promo check (patchset #5 id:80001 of https://codereview.chromium.org/2926413002/ )

Reason for revert:
crbug.com/732680

Original issue's description:
> Disable search functionality in ChromeActivity before search promo check
> 
> - Disable contextual search before we go through the search engine promo
> check
> - On a WebSearch from selection, first show the search engine promo and
> only after that send the search intent.
> 
> BUG=728891
> 
> Review-Url: https://codereview.chromium.org/2926413002
> Cr-Commit-Position: refs/heads/master@{#478677}
> Committed: https://chromium.googlesource.com/chromium/src/+/21f504945ba3712f0455a1b3711dcf576cda5ee3

TBR=tedchoc@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=728891

[Yusuf, 2017-06-13 17:04:08]

The CQ bit was checked by yusufo@chromium.org

[Yusuf, 2017-06-13 17:04:08]

Created Revert of Disable search functionality in ChromeActivity before search
promo check

[commit-bot: I haz the power, 2017-06-13 17:04:14]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-13 17:04:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-06-13 17:04:27]

Failed to apply patch for
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java:
While running git apply --index -3 -p1;
  error: patch failed:
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java:1378
  Falling back to three-way merge...
  Applied patch to
'chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java' with
conflicts.
  U chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Patch:      
chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git
a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index
07a959b1e654d827c9f000535257b9a1821bf320..289dad8178c97d3332aba8c2c1dae7a747c6ef29
100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -88,7 +88,6 @@
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.init.ProcessInitializationHandler;
-import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.media.PictureInPictureController;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.metrics.StartupMetrics;
@@ -741,7 +740,7 @@
      * @return Whether contextual search is allowed for this activity or not.
      */
     protected boolean isContextualSearchAllowed() {
-        return !LocaleManager.getInstance().needToCheckForSearchEnginePromo();
+        return true;
     }
 
     @Override
@@ -1378,18 +1377,9 @@
         return new IntentHandlerDelegate() {
             @Override
             public void processWebSearchIntent(String query) {
-                final Intent searchIntent = new
Intent(Intent.ACTION_WEB_SEARCH);
+                Intent searchIntent = new Intent(Intent.ACTION_WEB_SEARCH);
                 searchIntent.putExtra(SearchManager.QUERY, query);
-                Callback<Boolean> callback = new Callback<Boolean>() {
-                    @Override
-                    public void onResult(Boolean result) {
-                        if (result != null && result)
startActivity(searchIntent);
-                    }
-                };
-                if (!LocaleManager.getInstance().showSearchEnginePromoIfNeeded(
-                            ChromeActivity.this, callback)) {
-                    callback.onResult(true);
-                }
+                startActivity(searchIntent);
             }
 
             @Override

[Yusuf, 2017-06-14 21:27:04]

The CQ bit was checked by yusufo@chromium.org

[Yusuf, 2017-06-14 21:27:11]

The CQ bit was unchecked by yusufo@chromium.org