Do not process incoming intents to the search activity if promo is needed.

chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java

 // Copyright 2017 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.searchwidget;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
@@ skipping 80 matching lines @@
             showSearchEngineDialogIfNeededCallback.notifyCalled();
 
             if (shouldShowRealSearchDialog) {
                 LocaleManager.setInstanceForTest(new LocaleManager() {
                     @Override
                     public int getSearchEnginePromoShowType() {
                         return SEARCH_ENGINE_PROMO_SHOW_EXISTING;
                     }
                 });
                 super.showSearchEngineDialogIfNeeded(activity, onSearchEngineFinalized);
-                return;
+            } else {
+                LocaleManager.setInstanceForTest(new LocaleManager() {
+                    @Override
+                    public boolean needToCheckForSearchEnginePromo() {
+                        return false;
+                    }
+                });
+                if (!shouldDelayDeferredInitialization) onSearchEngineFinalized.onResult(true);
             }
-
-            if (!shouldDelayDeferredInitialization) onSearchEngineFinalized.onResult(true);
         }
 
         @Override
         public void onFinishDeferredInitialization() {
             onFinishDeferredInitializationCallback.notifyCalled();
         }
 
         @Override
         public void onDialogShown(DefaultSearchEnginePromoDialog dialog) {
             shownPromoDialog = dialog;
@@ skipping 10 matching lines @@
     @Before
     public void setUp() {
         mTestDelegate = new TestDelegate();
         SearchActivity.setDelegateForTests(mTestDelegate);
         DefaultSearchEnginePromoDialog.setObserverForTests(mTestDelegate);
     }
 
     @After
     public void tearDown() {
         SearchActivity.setDelegateForTests(null);
+        LocaleManager.setInstanceForTest(null);
     }
 
     @Test
     @SmallTest
     public void testOmniboxSuggestionContainerAppears() throws Exception {
         SearchActivity searchActivity = startSearchActivity();
 
         // Wait for the Activity to fully load.
         mTestDelegate.shouldDelayNativeInitializationCallback.waitForCallback(0);
         mTestDelegate.showSearchEngineDialogIfNeededCallback.waitForCallback(0);
@@ skipping 302 matching lines @@
             }
         }));
     }
 
     @SuppressLint("SetTextI18n")
     private void setUrlBarText(final Activity activity, final String url) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 UrlBar urlBar = (UrlBar) activity.findViewById(R.id.url_bar);
+                if (!urlBar.hasFocus()) urlBar.requestFocus();
                 urlBar.setText(url);
             }
         });
     }
 }