[Android] Further speculative fixes for search engine crashes.

[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250
Review-Url: https://codereview.chromium.org/2668593002
Cr-Commit-Position: refs/heads/master@{#447195}
Committed: https://chromium.googlesource.com/chromium/src/+/14c9281bb6a538be7e6d7f278d4fea7d5e838d08

[Ted C, 2017-01-31 00:18:25]

tedchoc@chromium.org changed reviewers:
+ twellington@chromium.org

[Ted C, 2017-01-31 00:18:25]

PTAL

[Theresa, 2017-01-31 00:35:45]

lgtm % nit

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
(right):

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java:426:
assert false;
Do we want to do some logging here (and below) before asserting false?

[Ted C, 2017-01-31 00:54:35]

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
(right):

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java:426:
assert false;
On 2017/01/31 00:35:45, Theresa wrote:
> Do we want to do some logging here (and below) before asserting false?

Done.

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
(right):

https://codereview.chromium.org/2668593002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java:124:
&& mTemplateUrlType == otherTemplateUrl.mTemplateUrlType
had to remove mTemplateUrlType because that changes if you make a search engine
a default

[Ted C, 2017-01-31 01:02:28]

The CQ bit was checked by tedchoc@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-31 01:03:10]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-31 01:49:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-31 01:49:16]

Dry run: This issue passed the CQ dry run.

[Ted C, 2017-01-31 05:34:48]

The CQ bit was checked by tedchoc@chromium.org

[Ted C, 2017-01-31 05:34:49]

The patchset sent to the CQ was uploaded after l-g-t-m from
twellington@chromium.org
Link to the patchset: https://codereview.chromium.org/2668593002/#ps20001
(title: "Address comments")

[commit-bot: I haz the power, 2017-01-31 05:34:58]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-31 05:40:53]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1485840888715680,
"parent_rev": "31addcf2b37c9c680d2c2f5982515258c7dc78b7", "commit_rev":
"14c9281bb6a538be7e6d7f278d4fea7d5e838d08"}

[commit-bot: I haz the power, 2017-01-31 05:41:48]

Description was changed from

==========
[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250
==========

to

==========
[Android] Further speculative fixes for search engine crashes.

Noticed that the .equals for TemplateUrl was not including
the new fields added recently.  The previous CL was not
updating the search engines if they equalled, but that would
not work if the keywords changed, which is the key used
to query the backend.

This handles the null in cases we are aware of, logs information
that we can traige further, but should unblock custom search
engines on Android.

BUG=670250

Review-Url: https://codereview.chromium.org/2668593002
Cr-Commit-Position: refs/heads/master@{#447195}
Committed:
https://chromium.googlesource.com/chromium/src/+/14c9281bb6a538be7e6d7f278d4f...
==========

[commit-bot: I haz the power, 2017-01-31 05:41:49]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/14c9281bb6a538be7e6d7f278d4f...