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

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.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.preferences.privacy;
 
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.preferences.ButtonPreference;
 import org.chromium.chrome.browser.preferences.Preferences;
+import org.chromium.chrome.browser.webapps.WebappDataStorage;
 import org.chromium.chrome.browser.webapps.WebappRegistry;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
@@ skipping 12 matching lines @@
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
     /**
      * Tests that web apps are cleared when the "cookies and site data" option is selected.
      */
     @MediumTest
     public void testClearingSiteDataClearsWebapps() throws Exception {
-        WebappRegistry.registerWebapp(getActivity(), "first");
+        WebappRegistry.registerWebapp(getActivity(), "first", "https://www.google.com");
         WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
             @Override
             public void onWebappIdsRetrieved(Set<String> ids) {
                 assertEquals(new HashSet<String>(Arrays.asList("first")), ids);
                 mCallbackCalled = true;
             }
         });
         CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ skipping 34 matching lines @@
         });
         CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mCallbackCalled;
             }
         });
     }
 
     /**
+     * Tests that web app URLs and last launch times are cleared when the "history" option is
+     * selected. However, the webapp is not removed from the registry.
+     */
+    @MediumTest
+    public void testClearingHistoryClearsWebappURLsAndLaunchTimes() throws Exception {
+        WebappRegistry.registerWebapp(getActivity(), "first", "https://www.google.com");
+        WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
+            @Override
+            public void onWebappIdsRetrieved(Set<String> ids) {
+                assertEquals(new HashSet<String>(Arrays.asList("first")), ids);
+                mCallbackCalled = true;
+            }
+        });
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        });
+        mCallbackCalled = false;
+
+        final Preferences preferences =
+                startPreferences(HistoryClearBrowsingDataPreferences.class.getName());
+
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                ClearBrowsingDataPreferences fragment =
+                        (ClearBrowsingDataPreferences) preferences.getFragmentForTest();
+                PreferenceScreen screen = fragment.getPreferenceScreen();
+                ButtonPreference clearButton = (ButtonPreference) screen.findPreference(
+                        ClearBrowsingDataPreferences.PREF_CLEAR_BUTTON);
+                clearButton.getOnPreferenceClickListener().onPreferenceClick(clearButton);
+            }
+        });
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                ClearBrowsingDataPreferences fragment =
+                        (ClearBrowsingDataPreferences) preferences.getFragmentForTest();
+                return fragment.getProgressDialog() == null;
+            }
+        });
+
+        // The webapp should still exist in the registry.

[gone, 2016/03/08 23:03:52]

web app?

[dominickn, 2016/03/09 08:18:32]

Done.

+        WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
+            @Override
+            public void onWebappIdsRetrieved(Set<String> ids) {
+                assertEquals(new HashSet<String>(Arrays.asList("first")), ids);
+                mCallbackCalled = true;
+            }
+        });
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        });
+        mCallbackCalled = false;
+
+        // URL should be empty.
+        WebappDataStorage.getOriginUrl(getActivity(), "first",

[gone, 2016/03/08 23:03:52]

Indenting here seems like it's kind of all over the place

[dominickn, 2016/03/09 08:18:32]

Indenting Java I don't know how

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

I want to say it's kind of subjective in these cases, but I guess this new
vresion seems alright.

+                new WebappDataStorage.FetchCallback<String>() {
+                    @Override
+                    public void onDataRetrieved(String readObject) {
+                        assertEquals(readObject, "");
+                        mCallbackCalled = true;
+                    }
+            });
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        });
+        mCallbackCalled = false;
+
+        // The last used time should be 0.
+        WebappDataStorage.getLastUsedTime(getActivity(), "first",
+                new WebappDataStorage.FetchCallback<Long>() {
+                    @Override
+                    public void onDataRetrieved(Long readObject) {
+                        long lastUsed = readObject;
+                        assertEquals(lastUsed, 0);
+                        mCallbackCalled = true;
+                    }
+            });
+        CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        });
+    }
+
+    /**
      * Tests that a fragment with all options preselected indeed has all checkboxes checked
      * on startup, and that deletion with all checkboxes checked completes successfully.
      */
     @MediumTest
     public void testClearingEverything() throws Exception {
         final Preferences preferences =
                 startPreferences(ClearEverythingBrowsingDataPreferences.class.getName());
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
@@ skipping 36 matching lines @@
         private static final EnumSet<DialogOption> DEFAULT_OPTIONS = EnumSet.of(
                 ClearBrowsingDataPreferences.DialogOption.CLEAR_COOKIES_AND_SITE_DATA);
 
         @Override
         protected boolean isOptionSelectedByDefault(DialogOption option) {
             return DEFAULT_OPTIONS.contains(option);
         }
     }
 
     /**
+     * A testing version of ClearBrowsingDataPreferences that preselects the history option.
+     * Must be public, as ChromeActivityTestCaseBase.startPreferences references it by name.
+     */
+    public static class HistoryClearBrowsingDataPreferences extends ClearBrowsingDataPreferences {
+        private static final EnumSet<DialogOption> DEFAULT_OPTIONS = EnumSet.of(
+                ClearBrowsingDataPreferences.DialogOption.CLEAR_HISTORY);
+
+        @Override
+        protected boolean isOptionSelectedByDefault(DialogOption option) {
+            return DEFAULT_OPTIONS.contains(option);
+        }
+    }
+
+    /**
      * A testing version of ClearBrowsingDataPreferences that includes all possible options,
      * and preselects all of them. Must be public, as ChromeActivityTestCaseBase.startPreferences
      * references it by name.
      */
     public static class ClearEverythingBrowsingDataPreferences
             extends ClearBrowsingDataPreferences {
         @Override
         protected void onOptionSelected() {
             // All options should be selected.
             EnumSet<DialogOption> options = getSelectedOptions();
             assertEquals(EnumSet.allOf(DialogOption.class), options);
 
             // Bookmarks currently must be handled on the Java side, and not passed to C++.
             options.remove(DialogOption.CLEAR_BOOKMARKS_DATA);
             clearBrowsingData(options);
         }
 
         @Override
         protected DialogOption[] getDialogOptions() {
             return DialogOption.values();
         }
 
         @Override
         protected boolean isOptionSelectedByDefault(DialogOption option) {
             return true;
         }
     }
 }