Remove the first launch from home screen requirement for notification deep linking.

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.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 51 matching lines @@
         }
 
         boolean getCallbackCalled() {
             return mCallbackCalled;
         }
     }
 
     private static class FetchStorageCallback
             implements WebappRegistry.FetchWebappDataStorageCallback {
         Intent mShortcutIntent;
-        boolean mMarkLaunched;
         boolean mCallbackCalled;
 
-        FetchStorageCallback(Intent shortcutIntent, boolean markLaunched) {
+        FetchStorageCallback(Intent shortcutIntent) {
             mCallbackCalled = false;
             mShortcutIntent = shortcutIntent;
-            mMarkLaunched = markLaunched;
         }
 
         @Override
         public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
             mCallbackCalled = true;
             storage.updateFromShortcutIntent(mShortcutIntent);
             storage.updateLastUsedTime();
-            if (mMarkLaunched) storage.setLaunched();
         }
 
         boolean getCallbackCalled() {
             return mCallbackCalled;
         }
     }
 
     private static class FetchStorageByUrlCallback
             implements WebappRegistry.FetchWebappDataStorageCallback {
         String mUrl;
@@ skipping 59 matching lines @@
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         Set<String> actual = mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
         assertEquals(1, actual.size());
         assertTrue(actual.contains("test"));
     }
 
     @Test
     @Feature({"Webapp"})
-    public void testWebappRegistrationUpdatesLastUsedAndDoesNotMarkLaunched() throws Exception {
+    public void testWebappRegistrationUpdatesLastUsed() throws Exception {
         WebappRegistry.registerWebapp(Robolectric.application, "test", null);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         long after = System.currentTimeMillis();
 
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
         long actual = webAppPrefs.getLong(WebappDataStorage.KEY_LAST_USED,
                 WebappDataStorage.LAST_USED_INVALID);
         assertTrue("Timestamp is out of range", actual <= after);
-
-        assertTrue(!webAppPrefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
     }
 
     @Test
     @Feature({"Webapp"})
     public void testWebappIdsRetrieval() throws Exception {
         final Set<String> expected = addWebappsToRegistry("first", "second");
 
         FetchCallback callback = new FetchCallback(expected);
         WebappRegistry.getRegisteredWebappIds(Robolectric.application, callback);
         BackgroundShadowAsyncTask.runBackgroundTasks();
@@ skipping 178 matching lines @@
     }
 
     @Test
     @Feature({"Webapp"})
     public void testClearWebappHistory() throws Exception {
         final String webapp1Url = "https://www.google.com";
         final String webapp2Url = "https://drive.google.com";
         Intent shortcutIntent1 = createShortcutIntent(webapp1Url);
         Intent shortcutIntent2 = createShortcutIntent(webapp2Url);
 
-        FetchStorageCallback storageCallback1 = new FetchStorageCallback(shortcutIntent1, true);
+        FetchStorageCallback storageCallback1 = new FetchStorageCallback(shortcutIntent1);
         WebappRegistry.registerWebapp(Robolectric.application, "webapp1", storageCallback1);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(storageCallback1.getCallbackCalled());
 
-        FetchStorageCallback storageCallback2 = new FetchStorageCallback(shortcutIntent2, false);
+        FetchStorageCallback storageCallback2 = new FetchStorageCallback(shortcutIntent2);
         WebappRegistry.registerWebapp(Robolectric.application, "webapp2", storageCallback2);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(storageCallback2.getCallbackCalled());
 
         SharedPreferences webapp1Prefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "webapp1", Context.MODE_PRIVATE);
         SharedPreferences webapp2Prefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "webapp2", Context.MODE_PRIVATE);
 
@@ skipping 10 matching lines @@
         assertTrue(actual.contains("webapp2"));
 
         // Verify that the last used time for both web apps is WebappDataStorage.LAST_USED_UNSET.
         long actualLastUsed = webapp1Prefs.getLong(
                 WebappDataStorage.KEY_LAST_USED, WebappDataStorage.LAST_USED_UNSET);
         assertEquals(WebappDataStorage.LAST_USED_UNSET, actualLastUsed);
         actualLastUsed = webapp2Prefs.getLong(
                 WebappDataStorage.KEY_LAST_USED, WebappDataStorage.LAST_USED_UNSET);
         assertEquals(WebappDataStorage.LAST_USED_UNSET, actualLastUsed);
 
-        // Verify that neither web app is marked as launched.
-        assertTrue(!webapp1Prefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
-        assertTrue(!webapp2Prefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
-
         // Verify that the URL and scope for both web apps is WebappDataStorage.URL_INVALID.
         String actualScope = webapp1Prefs.getString(
                 WebappDataStorage.KEY_SCOPE, WebappDataStorage.URL_INVALID);
         assertEquals(WebappDataStorage.URL_INVALID, actualScope);
         String actualUrl = webapp1Prefs.getString(
                 WebappDataStorage.KEY_URL, WebappDataStorage.URL_INVALID);
         assertEquals(WebappDataStorage.URL_INVALID, actualUrl);
         actualScope = webapp2Prefs.getString(
                 WebappDataStorage.KEY_SCOPE, WebappDataStorage.URL_INVALID);
         assertEquals(WebappDataStorage.URL_INVALID, actualScope);
         actualUrl = webapp2Prefs.getString(
                 WebappDataStorage.KEY_URL, WebappDataStorage.URL_INVALID);
         assertEquals(WebappDataStorage.URL_INVALID, actualUrl);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testGetAfterClearWebappHistory() throws Exception {
         WebappRegistry.registerWebapp(Robolectric.application, "webapp", null);
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         SharedPreferences webappPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "webapp", Context.MODE_PRIVATE);
         CallbackRunner callback = new CallbackRunner();
         WebappRegistry.clearWebappHistory(Robolectric.application, callback);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(callback.getCallbackCalled());
 
-        // Open the webapp up to set the last used time and launched.
-        FetchStorageCallback storageCallback = new FetchStorageCallback(null, true);
+        // Open the webapp up to set the last used time.
+        FetchStorageCallback storageCallback = new FetchStorageCallback(null);
         WebappRegistry.getWebappDataStorage(Robolectric.application, "webapp", storageCallback);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(storageCallback.getCallbackCalled());
 
         // Verify that the last used time is valid.
         long actualLastUsed = webappPrefs.getLong(
                 WebappDataStorage.KEY_LAST_USED, WebappDataStorage.LAST_USED_INVALID);
         assertTrue(WebappDataStorage.LAST_USED_INVALID != actualLastUsed);
         assertTrue(WebappDataStorage.LAST_USED_UNSET != actualLastUsed);
-
-        // Verify that the app is marked as launched.
-        assertTrue(webappPrefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
     }
 
     @Test
     @Feature({"Webapp"})
     public void testUpdateAfterClearWebappHistory() throws Exception {
         final String webappUrl = "http://www.google.com";
         final String webappScope = "http://www.google.com/";
         final Intent shortcutIntent = createShortcutIntent(webappUrl);
         WebappRegistry.registerWebapp(Robolectric.application, "webapp",
-                new FetchStorageCallback(shortcutIntent, false));
+                new FetchStorageCallback(shortcutIntent));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         SharedPreferences webappPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "webapp", Context.MODE_PRIVATE);
 
-        // Verify that the app is not marked as launched.
-        assertTrue(!webappPrefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
-
         // Verify that the URL and scope match the original in the intent.
         String actualUrl = webappPrefs.getString(
                 WebappDataStorage.KEY_URL, WebappDataStorage.URL_INVALID);
         assertEquals(webappUrl, actualUrl);
         String actualScope = webappPrefs.getString(
                 WebappDataStorage.KEY_SCOPE, WebappDataStorage.URL_INVALID);
         assertEquals(webappScope, actualScope);
 
         WebappRegistry.clearWebappHistory(Robolectric.application, new CallbackRunner());
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         // Update the webapp from the intent again.
         WebappRegistry.getWebappDataStorage(Robolectric.application, "webapp",
-                new FetchStorageCallback(shortcutIntent, true));
+                new FetchStorageCallback(shortcutIntent));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
-        // Verify that the app is marked as launched.
-        assertTrue(webappPrefs.getBoolean(WebappDataStorage.KEY_LAUNCHED, false));
-
         // Verify that the URL and scope match the original in the intent.
         actualUrl = webappPrefs.getString(WebappDataStorage.KEY_URL, WebappDataStorage.URL_INVALID);
         assertEquals(webappUrl, actualUrl);
         actualScope = webappPrefs.getString(
                 WebappDataStorage.KEY_SCOPE, WebappDataStorage.URL_INVALID);
         assertEquals(webappScope, actualScope);
     }
 
     @Test
     @Feature({"Webapp"})
@@ skipping 15 matching lines @@
         final String test5Url = "https://drive.google.com/docs/recent/trash";
         final String test6Url = "https://maps.google.com/";
 
         Intent shortcutIntent1 = createShortcutIntent(webapp1Url);
         Intent shortcutIntent2 = createShortcutIntent(webapp2Url);
         Intent shortcutIntent3 = createShortcutIntent(webapp3Url);
         Intent shortcutIntent4 = createShortcutIntent(webapp4Url);
 
         // Register the four web apps.
         WebappRegistry.registerWebapp(Robolectric.application, "webapp1",
-                new FetchStorageCallback(shortcutIntent1, true));
+                new FetchStorageCallback(shortcutIntent1));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         WebappRegistry.registerWebapp(Robolectric.application, "webapp2",
-                new FetchStorageCallback(shortcutIntent2, false));
+                new FetchStorageCallback(shortcutIntent2));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         WebappRegistry.registerWebapp(Robolectric.application, "webapp3",
-                new FetchStorageCallback(shortcutIntent3, true));
+                new FetchStorageCallback(shortcutIntent3));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         WebappRegistry.registerWebapp(Robolectric.application, "webapp4",
-                new FetchStorageCallback(shortcutIntent4, false));
+                new FetchStorageCallback(shortcutIntent4));
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
 
         // test1Url should return webapp1.
         FetchStorageByUrlCallback callback = new FetchStorageByUrlCallback(webapp1Url, webapp1Url);
         WebappRegistry.getWebappDataStorageForUrl(Robolectric.application, test1Url, callback);
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(callback.getCallbackCalled());
 
@@ skipping 55 matching lines @@
         return mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
     }
 
     private Intent createShortcutIntent(String url) {
         return ShortcutHelper.createWebappShortcutIntent("id", "action", url,
                 ShortcutHelper.getScopeFromUrl(url), "name", "shortName", null,
                 ShortcutHelper.WEBAPP_SHORTCUT_VERSION, 0, 0, 0, false);
     }
 }