Ensure TemplateUrlService is loaded in SearchActivity.

chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.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.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.Callback;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.WebContentsFactory;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.init.AsyncInitializationActivity;
 import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.omnibox.AutocompleteController;
+import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
 import org.chromium.chrome.browser.tab.TabIdManager;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.ActivityWindowAndroid;
@@ skipping 115 matching lines @@
                 new TabDelegateFactory(), false, false);
         mTab.loadUrl(new LoadUrlParams("about:blank"));
 
         mSearchBoxDataProvider.onNativeLibraryReady(mTab);
         mSearchBox.onNativeLibraryReady();
 
         // Force the user to choose a search engine if they have to.
         final Callback<Boolean> deferredCallback = new Callback<Boolean>() {
             @Override
             public void onResult(Boolean result) {
+                if (isActivityDestroyed()) return;
+
                 if (result == null || !result.booleanValue()) {
                     Log.e(TAG, "User failed to select a default search engine.");
                     finish();
                     return;
                 }
 
                 finishDeferredInitialization();
             }
         };
-        if (!getActivityDelegate().showSearchEngineDialogIfNeeded(this, deferredCallback)) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    finishDeferredInitialization();
+        final Runnable showSearchEngineDialogTrigger = new Runnable() {
+            @Override
+            public void run() {
+                if (!getActivityDelegate().showSearchEngineDialogIfNeeded(
+                            SearchActivity.this, deferredCallback)) {
+                    mHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            deferredCallback.onResult(true);
+                        }
+                    });
                 }
-            });
-        }
+            }
+        };
+        TemplateUrlService.getInstance().runWhenLoaded(showSearchEngineDialogTrigger);
     }
 
     void finishDeferredInitialization() {
         mIsActivityUsable = true;
         if (mQueuedUrl != null) loadUrl(mQueuedUrl);
 
         AutocompleteController.nativePrefetchZeroSuggestResults();
         CustomTabsConnection.getInstance(getApplication()).warmup(0);
         mSearchBox.onDeferredStartup(isVoiceSearchIntent());
         RecordUserAction.record("SearchWidget.WidgetSelected");
@@ skipping 95 matching lines @@
         }
         return sDelegate;
     }
 
     /** See {@link #sDelegate}. */
     @VisibleForTesting
     static void setDelegateForTests(SearchActivityDelegate delegate) {
         sDelegate = delegate;
     }
 }