[Android] Further speculative fixes for search engine crashes.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.search_engines;
 
 import android.support.annotation.IntDef;
 import android.text.TextUtils;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Android wrapper of the TemplateUrlService which provides access from the Java
  * layer.
  *
  * Only usable from the UI thread as it's primary purpose is for supporting the Android
  * preferences UI.
  *
  * See components/search_engines/template_url_service.h for more details.
  */
@@ skipping 32 matching lines @@
      */
     public static class TemplateUrl {
         private final int mIndex;
         private final String mShortName;
         private final boolean mIsPrepopulated;
         private final String mKeyword;
         @TemplateUrlType private int mTemplateUrlType;
 
         @CalledByNative("TemplateUrl")
         public static TemplateUrl create(
-                int id, String shortName, boolean isPrepopulated, String keyword) {
-            return new TemplateUrl(id, shortName, isPrepopulated, keyword);
+                int index, String shortName, boolean isPrepopulated, String keyword) {
+            return new TemplateUrl(index, shortName, isPrepopulated, keyword);
         }
 
         public TemplateUrl(
                 int index, String shortName, boolean isPrepopulated, String keyword) {
             mIndex = index;
             mShortName = shortName;
             mIsPrepopulated = isPrepopulated;
             mKeyword = keyword;
         }
 
@@ skipping 28 matching lines @@
             int result = 1;
             result = prime * result + mIndex;
             result = prime * result + ((mShortName == null) ? 0 : mShortName.hashCode());
             return result;
         }
 
         @Override
         public boolean equals(Object other) {
             if (!(other instanceof TemplateUrl)) return false;
             TemplateUrl otherTemplateUrl = (TemplateUrl) other;
+            // Explicitly excluding mTemplateUrlType as that will change if the search engine is
+            // set as default.
             return mIndex == otherTemplateUrl.mIndex
+                    && mIsPrepopulated == otherTemplateUrl.mIsPrepopulated
+                    && TextUtils.equals(mKeyword, otherTemplateUrl.mKeyword)
                     && TextUtils.equals(mShortName, otherTemplateUrl.mShortName);
         }
+
+        @Override
+        public String toString() {
+            return String.format(Locale.US,
+                    "TemplateURL -- keyword: %s, short name: %s, index: %d, "
+                    + "type: %d, prepopulated: %b",
+                    mKeyword, mShortName, mIndex, mTemplateUrlType, mIsPrepopulated);
+        }
     }
 
     private static TemplateUrlService sService;
 
     public static TemplateUrlService getInstance() {
         ThreadUtils.assertOnUiThread();
         if (sService == null) {
             sService = new TemplateUrlService();
         }
         return sService;
@@ skipping 260 matching lines @@
             String query, String currentUrl);
     private native String nativeGetUrlForContextualSearchQuery(long nativeTemplateUrlServiceAndroid,
             String query, String alternateTerm, boolean shouldPrefetch, String protocolVersion);
     private native String nativeGetSearchEngineUrlFromTemplateUrl(
             long nativeTemplateUrlServiceAndroid, String keyword);
     private native String nativeAddSearchEngineForTesting(
             long nativeTemplateUrlServiceAndroid, String keyword, int offset);
     private native String nativeUpdateLastVisitedForTesting(
             long nativeTemplateUrlServiceAndroid, String keyword);
 }