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

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java
index 4b15554bd7beeb3b89deb00c55fe753dfa6be346..38e76511920ee24b4caa86647273702087e7afc5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/searchwidget/SearchActivityTest.java
@@ -98,10 +98,15 @@ public class SearchActivityTest {
                     }
                 });
                 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
@@ -132,6 +137,7 @@ public class SearchActivityTest {
     @After
     public void tearDown() {
         SearchActivity.setDelegateForTests(null);
+        LocaleManager.setInstanceForTest(null);
     }
 
     @Test
@@ -454,6 +460,7 @@ public class SearchActivityTest {
             @Override
             public void run() {
                 UrlBar urlBar = (UrlBar) activity.findViewById(R.id.url_bar);
+                if (!urlBar.hasFocus()) urlBar.requestFocus();
                 urlBar.setText(url);
             }
         });