Fix ExploreSitesBridgeExperimentalTest on O+

Fixes ExploreSitesBridgeExperimentalTest#testGetIcon which was failing
100% of the time on O+ due to a bug in Android's Bitmap.sameAs.

Also moves some asserts around so that failures in this test show up
properly as assertion errors instead of inducing a browser crash.

Bug: 927014, 884413
Change-Id: Iff6122932c4a1c4df32aa2104f14960908fd90e2
Reviewed-on: https://chromium-review.googlesource.com/c/1446831
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629336}
1 file changed