| Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
|
| index 6b9a736d5731b4561ded9b3a685540d2591e1199..f12c987e137beea0c2129a89153f31c03154162a 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
|
| @@ -29,6 +29,9 @@ public class TemplateUrlService {
|
| public abstract void onTemplateUrlServiceLoaded();
|
| }
|
|
|
| + /**
|
| + * Represents search engine with its index.
|
| + */
|
| public static class TemplateUrl {
|
| private final int mIndex;
|
| private final String mShortName;
|
| @@ -130,7 +133,11 @@ public class TemplateUrlService {
|
| if (!isLoaded()) return null;
|
|
|
| int defaultSearchEngineIndex = getDefaultSearchEngineIndex();
|
| + if (defaultSearchEngineIndex == -1) return null;
|
| +
|
| assert defaultSearchEngineIndex >= 0;
|
| + assert defaultSearchEngineIndex < nativeGetTemplateUrlCount(
|
| + mNativeTemplateUrlServiceAndroid);
|
|
|
| return nativeGetPrepopulatedTemplateUrlAt(
|
| mNativeTemplateUrlServiceAndroid, defaultSearchEngineIndex);
|
|
|