[Android] Fix search engine page crash when users change language

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
index a48eea848cdd77a554d82408ec4a1e7adeeac058..2982f4655b569ebc5f0c5669be2d5b9146ebb267 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
@@ -103,7 +103,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
         if (!templateUrlService.isLoaded()) {
             templateUrlService.registerLoadListener(this);
             templateUrlService.load();
-            return;  // Flow continues in onTemplateUrlServiceLoaded below.
+            return;
         }

[Theresa, 2016/10/03 23:50:09]

nit: add this comment back?

 
         // Fetch all the search engine info and the currently active one.
@@ -129,7 +129,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
 
     @Override
     public int getCount() {
-        return mSearchEngines.size();
+        return mSearchEngines == null ? 0 : mSearchEngines.size();
     }
 
     @Override
@@ -222,6 +222,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
     public void onTemplateUrlServiceLoaded() {
         TemplateUrlService.getInstance().unregisterLoadListener(this);
         initEntries();
+        notifyDataSetChanged();
     }
 
     // OnClickListener: