The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/06aa457920d30616cc4c47c23057714694e3b3a7

commit 06aa457920d30616cc4c47c23057714694e3b3a7
Author: ltian <ltian@chromium.org>
Date: Wed Feb 22 05:46:36 2017

[Android] Fix a custom search engine bounces when it selected and unselected as default engine

When there are mutliple custom search engines displayed on setting page,
selecting and unselecting all except the top one will make them bounce
between default list and custom engine list. The right behaivor should
be the selected custom engine should remain in the same place and be
updated next time loading the setting page.

It is caused using their indexes to decide whether two engines are the
same. However, selecting/unselecting a custom engine will make Chrome
reorder the engine list which changes the selected/unselected one's
index and forces Chrome to refresh the list on Android.

To fix it, index of a search engine should not be used to decide whether
two engines are the same.

BUG= 692343 

Review-Url: https://codereview.chromium.org/2691033007
Cr-Commit-Position: refs/heads/master@{#451890}

[modify] https://crrev.com/06aa457920d30616cc4c47c23057714694e3b3a7/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
[modify] https://crrev.com/06aa457920d30616cc4c47c23057714694e3b3a7/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/70335e0880ba8cbe86aad7e3e53965ec23c7c9b2

commit 70335e0880ba8cbe86aad7e3e53965ec23c7c9b2
Author: ltian <ltian@chromium.org>
Date: Fri Mar 03 20:41:56 2017

[Android] Fix a custom search engine bounces when it selected and unselected as default engine

When there are mutliple custom search engines displayed on setting page,
selecting and unselecting all except the top one will make them bounce
between default list and custom engine list. The right behaivor should
be the selected custom engine should remain in the same place and be
updated next time loading the setting page.

It is caused using their indexes to decide whether two engines are the
same. However, selecting/unselecting a custom engine will make Chrome
reorder the engine list which changes the selected/unselected one's
index and forces Chrome to refresh the list on Android.

To fix it, index of a search engine should not be used to decide whether
two engines are the same.

BUG= 692343 
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2691033007
Cr-Commit-Position: refs/heads/master@{#451890}
(cherry picked from commit 06aa457920d30616cc4c47c23057714694e3b3a7)

Review-Url: https://codereview.chromium.org/2729253002
Cr-Commit-Position: refs/branch-heads/2987@{#757}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/70335e0880ba8cbe86aad7e3e53965ec23c7c9b2/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
[modify] https://crrev.com/70335e0880ba8cbe86aad7e3e53965ec23c7c9b2/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java