Fix bug where wrong search engine is shown in Settings.

chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java
index 1c26ec55d18d8ab21d6e0caab5f63778d49731e6..e8a78c34f690853a963b7eeb597124fd464697d0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java
@@ -64,7 +64,8 @@ public class SearchEnginePreference extends ChromeBaseListPreference implements
         }
 
         List<TemplateUrl> searchEngines = templateUrlService.getLocalizedSearchEngines();
-        int currentSearchEngineIndex = templateUrlService.getDefaultSearchEngineIndex();
+        int defaultSearchEngineIndex = templateUrlService.getDefaultSearchEngineIndex();
+        int valueIndex = -1;
 
         Resources resources = getContext().getResources();
         CharSequence[] entries = new CharSequence[searchEngines.size()];
@@ -73,11 +74,12 @@ public class SearchEnginePreference extends ChromeBaseListPreference implements
             TemplateUrl templateUrl = searchEngines.get(i);
             entries[i] = getSearchEngineNameAndDomain(resources, templateUrl);
             entryValues[i] = Integer.toString(templateUrl.getIndex());
+            if (templateUrl.getIndex() == defaultSearchEngineIndex) valueIndex = i;
         }
 
         setEntries(entries);
         setEntryValues(entryValues);
-        setValueIndex(currentSearchEngineIndex);
+        if (valueIndex != -1) setValueIndex(valueIndex);

[Ted C, 2015/03/23 15:12:10]

in what cases do we expect this to be -1?

[newt (away), 2015/03/23 16:43:16]

If the search engine is managed and set to internalsearch.example.com, this
could be -1. We probably want to handle that case better, though, and actually
show the search engine's name in the summary.

         setOnPreferenceChangeListener(this);
     }