Android: use assertEquals in base javatests

No change to logic. This uses `assertEquals(a, b)` instead of
`assertTrue(a.equals(b))` (or, `assertTrue(a == b)`), since the former
provides better error output.

Test: out/Default/bin/run_content_shell_test_apk -f CommandLineTest.*
Change-Id: I85e0225a38788ca08983ec2cc3e9ca530afd14f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1954346
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#722337}

base/android/javatests/src/org/chromium/base/CommandLineTest.java

@@ -69,7 +69,7 @@ public class CommandLineTest {
         Assert.assertFalse(cl.hasSwitch(CL_ADDED_SWITCH_2));
         Assert.assertNull(cl.getSwitchValue(CL_ADDED_SWITCH_2));
         cl.appendSwitchWithValue(CL_ADDED_SWITCH_2, CL_ADDED_VALUE_2);
-        Assert.assertTrue(CL_ADDED_VALUE_2.equals(cl.getSwitchValue(CL_ADDED_SWITCH_2)));
+        Assert.assertEquals(CL_ADDED_VALUE_2, cl.getSwitchValue(CL_ADDED_SWITCH_2));
 
         // Update a switch's value.
         cl.appendSwitchWithValue(CL_ADDED_SWITCH_2, "updatedValue");
@@ -84,7 +84,7 @@ public class CommandLineTest {
         Assert.assertFalse(cl.hasSwitch("dummy"));
         Assert.assertFalse(cl.hasSwitch("command"));
         Assert.assertTrue(cl.hasSwitch("superfast"));
-        Assert.assertTrue("turbo".equals(cl.getSwitchValue("speed")));
+        Assert.assertEquals("turbo", cl.getSwitchValue("speed"));
 
         // Remove a plain switch.
         cl.removeSwitch(CL_ADDED_SWITCH);

base/android/javatests/src/org/chromium/base/ObserverListTest.java

@@ -158,9 +158,9 @@ public class ObserverListTest {
 
         Iterator<Integer> it = observerList.iterator();
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(5 == it.next());
+        Assert.assertEquals(5, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(15 == it.next());
+        Assert.assertEquals(15, (int) it.next());
         Assert.assertFalse(it.hasNext());
 
         boolean removeExceptionThrown = false;
@@ -195,21 +195,21 @@ public class ObserverListTest {
 
         ObserverList.RewindableIterator<Integer> it = observerList.rewindableIterator();
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(5 == it.next());
+        Assert.assertEquals(5, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(10 == it.next());
+        Assert.assertEquals(10, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(15 == it.next());
+        Assert.assertEquals(15, (int) it.next());
         Assert.assertFalse(it.hasNext());
 
         it.rewind();
 
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(5 == it.next());
+        Assert.assertEquals(5, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(10 == it.next());
+        Assert.assertEquals(10, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(15 == it.next());
+        Assert.assertEquals(15, (int) it.next());
         Assert.assertEquals(5, (int) observerList.mObservers.get(0));
         observerList.removeObserver(5);
         Assert.assertEquals(null, observerList.mObservers.get(0));
@@ -218,9 +218,9 @@ public class ObserverListTest {
 
         Assert.assertEquals(10, (int) observerList.mObservers.get(0));
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(10 == it.next());
+        Assert.assertEquals(10, (int) it.next());
         Assert.assertTrue(it.hasNext());
-        Assert.assertTrue(15 == it.next());
+        Assert.assertEquals(15, (int) it.next());
     }
 
     @Test