[Offline pages]: DeletePagesByClientIdAndOrigin API should take origin instead of string

Bug: 812022
Change-Id: I8cb1c8e9566bf4fb92f67ef5b8c9e434467e647b
Reviewed-on: https://chromium-review.googlesource.com/944620
Commit-Queue: Cathy Li <chili@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543455}

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java

@@ -523,7 +523,7 @@ public class OfflinePageBridge {
      * @param callback A callback that will be called once operation is completed.
      */
     public void deletePagesByClientIdAndOrigin(
-            List<ClientId> clientIds, String origin, Callback<Integer> callback) {
+            List<ClientId> clientIds, OfflinePageOrigin origin, Callback<Integer> callback) {
         String[] namespaces = new String[clientIds.size()];
         String[] ids = new String[clientIds.size()];
 
@@ -533,7 +533,7 @@ public class OfflinePageBridge {
         }
 
         nativeDeletePagesByClientIdAndOrigin(
-                mNativeOfflinePageBridge, namespaces, ids, origin, callback);
+                mNativeOfflinePageBridge, namespaces, ids, origin.encodeAsJsonString(), callback);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageOrigin.java

@@ -141,6 +141,25 @@ public class OfflinePageOrigin {
         return mAppName;
     }
 
+    @Override
+    public String toString() {
+        return encodeAsJsonString();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other != null && other instanceof OfflinePageOrigin) {
+            OfflinePageOrigin o = (OfflinePageOrigin) other;
+            return mAppName.equals(o.mAppName) && Arrays.equals(mSignatures, o.mSignatures);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.deepHashCode(new Object[] {mAppName, mSignatures});
+    }
+
     /**
      * @param context The context to look up signatures.
      * @param appName The name of the application to look up.

chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageOriginUnitTest.java

@@ -5,6 +5,8 @@
 package org.chromium.chrome.browser.offlinepages;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,4 +26,25 @@ public class OfflinePageOriginUnitTest {
 
         assertEquals("[\"abc.xyz\",[\"deadbeef\",\"00c0ffee\"]]", origin.encodeAsJsonString());
     }
+
+    @Test
+    public void testEquals() {
+        String appName = "abc.xyz";
+        String[] signature1 = new String[] {"deadbeef", "00c0ffee"};
+        String[] signature2 = new String[] {"deadbeef", "fooba499"};
+        OfflinePageOrigin origin1 = new OfflinePageOrigin(appName, signature1);
+        OfflinePageOrigin origin2 = new OfflinePageOrigin(appName, signature2);
+        OfflinePageOrigin origin3 = new OfflinePageOrigin("", signature1);
+        OfflinePageOrigin origin4 = new OfflinePageOrigin(appName, signature1);
+
+        assertFalse("Equivalent to null", origin1.equals(null));
+        assertTrue("Not equivalent to self", origin1.equals(origin1));
+        assertFalse("Equivalent when signatures not equal", origin1.equals(origin2));
+        assertFalse("Equivalent when name not equal", origin1.equals(origin3));
+        assertTrue("Equally created items not equal", origin1.equals(origin4));
+
+        assertEquals("HashCode not equal to self", origin1.hashCode(), origin1.hashCode());
+        assertEquals(
+                "HashCode not equal when items are equal", origin1.hashCode(), origin4.hashCode());
+    }
 }