Ensure TemplateUrlService is loaded in SearchActivity.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
index f776cc791ad496ca320e0c9125608324334632f0..465395e5deef56f2cdcc727382d3d137aa8108e9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
@@ -288,19 +288,13 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir
     public void finishNativeInitialization() {
         super.finishNativeInitialization();
 
-        final TemplateUrlService templateUrlService = TemplateUrlService.getInstance();
-        if (templateUrlService.isLoaded()) {
-            onNativeDependenciesFullyInitialized();
-        } else {
-            templateUrlService.registerLoadListener(new TemplateUrlService.LoadListener() {
-                @Override
-                public void onTemplateUrlServiceLoaded() {
-                    templateUrlService.unregisterLoadListener(this);
-                    onNativeDependenciesFullyInitialized();
-                }
-            });
-            templateUrlService.load();
-        }
+        Runnable onNativeFinished = new Runnable() {
+            @Override
+            public void run() {
+                onNativeDependenciesFullyInitialized();
+            }
+        };
+        TemplateUrlService.getInstance().runWhenLoaded(onNativeFinished);
     }
 
     private void onNativeDependenciesFullyInitialized() {