Clear webapp storage when site data is cleared

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragmentTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragmentTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..08b5a7c2c0200709b468a6329c680f02d8edc0ba
--- /dev/null
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataDialogFragmentTest.java
@@ -0,0 +1,101 @@
+// 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.app.Dialog;
+import android.support.v7.app.AlertDialog;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.widget.Button;
+
+import org.chromium.base.ThreadUtils;
+import org.chromium.chrome.browser.ChromeActivity;
+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.EnumSet;
+import java.util.Set;
+
+/**
+ * Peforms integration tests with ClearBrowsingDataDialogFragment.
+ */
+public class ClearBrowsingDataDialogFragmentTest
+        extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+    private TestClearDataDialogFragment mFragment;
+    private boolean mCallbackCalled;
+
+    public ClearBrowsingDataDialogFragmentTest() {
+        super(ChromeActivity.class);
+        mCallbackCalled = false;

[gone, 2015/09/09 23:30:40]

nit: Remove. Java member booleans are default initialized to false.  That kind
of thing should be put in setUp(), anyway.

[Lalit Maganti, 2015/09/10 09:41:57]

Done.

+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        startMainActivityOnBlankPage();
+    }
+
+    @MediumTest
+    public void testClearingSiteDataClearsWebapps() throws Exception {
+        mFragment = new TestClearDataDialogFragment(EnumSet.of(
+                ClearBrowsingDataDialogFragment.DialogOption.CLEAR_COOKIES_AND_SITE_DATA));
+        WebappRegistry.registerWebapp(getActivity(), "first");
+

[gone, 2015/09/09 23:30:39]

Confirm you actually registered the app before checking if it's gone.

[Lalit Maganti, 2015/09/10 09:41:57]

Done.

+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mFragment.show(getActivity().getFragmentManager(),
+                        ClearBrowsingDataDialogFragment.FRAGMENT_TAG);
+            }
+        });
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mFragment.getDialog() != null;
+            }

[gone, 2015/09/09 23:30:39]

nit: newline; start of new step in the test.

[Lalit Maganti, 2015/09/10 09:41:57]

Done.

+        }));
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                Dialog dialog = mFragment.getDialog();
+                Button clearButton = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
+                clearButton.performClick();
+            }
+        });
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mFragment.getProgressDialog() == null;
+            }
+        }));

[gone, 2015/09/09 23:30:39]

nit: newline; new phase.

[Lalit Maganti, 2015/09/10 09:41:57]

Done.

+        WebappRegistry.getRegisteredWebappIds(getActivity(), new WebappRegistry.FetchCallback() {
+            @Override
+            public void onWebappIdsRetrieved(Set<String> ids) {
+                assertTrue(ids.isEmpty());
+                mCallbackCalled = true;
+            }
+        });
+        assertTrue(CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return mCallbackCalled;
+            }
+        }));
+    }
+
+    private static class TestClearDataDialogFragment extends ClearBrowsingDataDialogFragment {
+        private final EnumSet<DialogOption> mDefaultOptions;
+
+        public TestClearDataDialogFragment(EnumSet<DialogOption> defaultOptions) {
+            mDefaultOptions = defaultOptions;
+        }
+
+        @Override
+        protected EnumSet<DialogOption> getDefaultDialogOptionsSelections() {
+            return mDefaultOptions;
+        }
+    }
+}