Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java

Index: mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java
index e957bfe4b9725b91a78e46301d5aa32afa94d557..6886023375c1df53ea2036faa47791ac5b00e59b 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTest.java
@@ -27,7 +27,6 @@ import org.chromium.mojo.system.MessagePipeHandle;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.Arrays;
 
 /**
  * Testing generated classes and associated features.
@@ -47,20 +46,6 @@ public class BindingsTest extends TestCase {
     }
 
     /**
-     * Check that 2 Bar instances are equals.
-     */
-    private static void assertBarEquals(Bar bar, Bar bar2) {
-        if (bar == bar2) {
-            return;
-        }
-        assertTrue(bar != null && bar2 != null);
-        assertEquals(bar.alpha, bar2.alpha);
-        assertEquals(bar.beta, bar2.beta);
-        assertEquals(bar.gamma, bar2.gamma);
-        assertEquals(bar.type, bar2.type);
-    }
-
-    /**
      * Create a new typical Foo instance.
      */
     private static Foo createFoo() {
@@ -96,31 +81,6 @@ public class BindingsTest extends TestCase {
         return foo;
     }
 
-    /**
-     * Check that 2 Foo instances are equals.
-     */
-    private static void assertFooEquals(Foo foo1, Foo foo2) {
-        assertEquals(foo1.a, foo2.a);
-        assertEquals(foo1.b, foo2.b);
-        assertEquals(foo1.c, foo2.c);
-        assertEquals(foo1.name, foo2.name);
-        assertEquals(foo1.x, foo2.x);
-        assertEquals(foo1.y, foo2.y);
-        TestCase.assertTrue(Arrays.deepEquals(foo1.arrayOfArrayOfBools, foo2.arrayOfArrayOfBools));
-        assertBarEquals(foo1.bar, foo2.bar);
-        assertTrue(Arrays.equals(foo1.data, foo2.data));
-        TestCase.assertTrue(Arrays.deepEquals(foo1.multiArrayOfStrings, foo2.multiArrayOfStrings));
-        assertEquals(foo1.source, foo2.source);
-        TestCase.assertTrue(Arrays.deepEquals(foo1.inputStreams, foo2.inputStreams));
-        TestCase.assertTrue(Arrays.deepEquals(foo1.outputStreams, foo2.outputStreams));
-        if (foo1.extraBars != foo2.extraBars) {
-            assertEquals(foo1.extraBars.length, foo2.extraBars.length);
-            for (int i = 0; i < foo1.extraBars.length; ++i) {
-                assertBarEquals(foo1.extraBars[i], foo2.extraBars[i]);
-            }
-        }
-    }
-
     private static <T> void checkConstantField(
             Field field, Class<T> expectedClass, T value) throws IllegalAccessException {
         assertEquals(expectedClass, field.getType());
@@ -235,7 +195,7 @@ public class BindingsTest extends TestCase {
         Foo typicalFoo = createFoo();
         Message serializedFoo = typicalFoo.serialize(null);
         Foo deserializedFoo = Foo.deserialize(serializedFoo);
-        assertFooEquals(typicalFoo, deserializedFoo);
+        assertEquals(typicalFoo, deserializedFoo);
     }
 
     /**