Android: Use ObserverList to maintain a list of observers/listeners

chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

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 e52d0c14339343535be272bfca07c4750b4163c6..f2a513f31135878675e9b0f5f97c48f23049ef64 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
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.search_engines;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 
 import java.util.ArrayList;
@@ -68,7 +69,7 @@ public class TemplateUrlService {
     }
 
     private final int mNativeTemplateUrlServiceAndroid;
-    private final List<LoadListener> mLoadListeners = new ArrayList<LoadListener>();
+    private final ObserverList<LoadListener> mLoadListeners = new ObserverList<LoadListener>();
 
     private TemplateUrlService() {
         // Note that this technically leaks the native object, however, TemlateUrlService
@@ -129,8 +130,8 @@ public class TemplateUrlService {
      */
     public void registerLoadListener(LoadListener listener) {
         ThreadUtils.assertOnUiThread();
-        assert !mLoadListeners.contains(listener);
-        mLoadListeners.add(listener);
+        assert !mLoadListeners.hasObserver(listener);
+        mLoadListeners.addObserver(listener);
     }
 
     /**
@@ -138,9 +139,8 @@ public class TemplateUrlService {
      */
     public void unregisterLoadListener(LoadListener listener) {
         ThreadUtils.assertOnUiThread();
-        assert (mLoadListeners.size() > 0);
-        assert (mLoadListeners.contains(listener));
-        mLoadListeners.remove(listener);
+        assert (mLoadListeners.hasObserver(listener));
+        mLoadListeners.removeObserver(listener);
     }
 
     private native int nativeInit();