Store URLs in WebappDataStorage, and purge them when history is cleared.

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
@@ skipping 14 matching lines @@
  * Tests the WebappDataStorage class by ensuring that it persists data to
  * SharedPreferences as expected.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE, shadows = {BackgroundShadowAsyncTask.class})
 public class WebappDataStorageTest {
 
     private SharedPreferences mSharedPreferences;
     private boolean mCallbackCalled;
 
+    private class FetchCallback<T> implements WebappDataStorage.FetchCallback<T> {
+        FetchCallback(T expected) {
+            mExpected = expected;
+        }
+
+        @Override
+        public void onDataRetrieved(T readObject) {
+            mCallbackCalled = true;
+            assertEquals(mExpected, readObject);
+        }
+
+        T mExpected;

[gone, 2016/03/10 23:27:22]

Put this field up at the top.

[dominickn, 2016/03/11 05:14:43]

Done.

+    }
+
     @Before
     public void setUp() throws Exception {
         mSharedPreferences = Robolectric.application
                 .getSharedPreferences("webapp_test", Context.MODE_PRIVATE);
 
         // Set the last_used as if the web app had been registered by WebappRegistry.
         mSharedPreferences.edit().putLong("last_used", 0).commit();
 
         mCallbackCalled = false;
     }
 
     @Test
     @Feature({"Webapp"})
     public void testBackwardCompat() {
         assertEquals("webapp_", WebappDataStorage.SHARED_PREFS_FILE_PREFIX);
         assertEquals("splash_icon", WebappDataStorage.KEY_SPLASH_ICON);
         assertEquals("last_used", WebappDataStorage.KEY_LAST_USED);
+        assertEquals("origin_url", WebappDataStorage.KEY_ORIGIN_URL);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testLastUsedRetrieval() throws Exception {
         mSharedPreferences.edit()
                 .putLong(WebappDataStorage.KEY_LAST_USED, 100L)
                 .commit();
 
         WebappDataStorage.getLastUsedTime(Robolectric.application, "test",
-                new WebappDataStorage.FetchCallback<Long>() {
-                    @Override
-                    public void onDataRetrieved(Long readObject) {
-                        mCallbackCalled = true;
-                        assertEquals(100L, (long) readObject);
-                    }
-                });
+                new FetchCallback<Long>(new Long(100L)));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         assertTrue(mCallbackCalled);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testOpenUpdatesLastUsed() throws Exception {
         long before = System.currentTimeMillis();
@@ skipping 57 matching lines @@
             for (int j = 0; j < actual.getHeight(); j++) {
                 if (actual.getPixel(i, j) != 0) return false;
             }
         }
         return true;
     }
 
     private static Bitmap createBitmap() {
         return Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_4444);
     }
-}
+
+    @Test
+    @Feature({"Webapp"})
+    public void testOriginUrlRetrieval() throws Exception {
+        final String origin = "http://drive.google.com";
+        mSharedPreferences.edit()
+                .putString(WebappDataStorage.KEY_ORIGIN_URL, origin)
+                .commit();
+
+        WebappDataStorage.getOriginUrl(Robolectric.application, "test",
+                new FetchCallback<String>(origin));
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+
+        assertTrue(mCallbackCalled);
+    }
+
+    @Test
+    @Feature({"Webapp"})
+    public void testOriginUrlUpdate() throws Exception {
+        final String origin = "http://maps.google.com";
+
+        WebappDataStorage.updateOriginUrl(Robolectric.application, "test", origin);
+        BackgroundShadowAsyncTask.runBackgroundTasks();
+        Robolectric.runUiThreadTasks();
+
+        assertEquals(origin, mSharedPreferences.getString(WebappDataStorage.KEY_ORIGIN_URL, null));
+    }
+}