| Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
|
| index 84d23c9ba249f0c0fe37d73ddba466164c45ef63..3189f7cef1d6561cfdb633b60ca3e7606ca7abf7 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
|
| @@ -13,6 +13,7 @@ import android.view.LayoutInflater;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
|
|
| +import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.IntentHandler;
|
| import org.chromium.chrome.browser.WebContentsFactory;
|
| @@ -36,6 +37,8 @@ import org.chromium.ui.base.ActivityWindowAndroid;
|
| public class SearchActivity extends AsyncInitializationActivity
|
| implements SnackbarManageable, SearchActivityLocationBarLayout.Delegate,
|
| View.OnLayoutChangeListener {
|
| + /** Setting this field causes the Activity to finish itself immediately for tests. */
|
| + private static boolean sIsDisabledForTest;
|
|
|
| /** Main content view. */
|
| private ViewGroup mContentView;
|
| @@ -54,6 +57,12 @@ public class SearchActivity extends AsyncInitializationActivity
|
| private Tab mTab;
|
|
|
| @Override
|
| + protected boolean isStartedUpCorrectly(Intent intent) {
|
| + if (sIsDisabledForTest) return false;
|
| + return true;
|
| + }
|
| +
|
| + @Override
|
| public void backKeyPressed() {
|
| cancelSearch();
|
| }
|
| @@ -219,4 +228,10 @@ public class SearchActivity extends AsyncInitializationActivity
|
| finish();
|
| overridePendingTransition(0, R.anim.activity_close_exit);
|
| }
|
| +
|
| + /** See {@link #sIsDisabledForTest}. */
|
| + @VisibleForTesting
|
| + static void disableForTests() {
|
| + sIsDisabledForTest = true;
|
| + }
|
| }
|
|
|