Change the CBD dialog on Android to a PreferenceFragment

chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
index f6603e4e2759869f055ade7644efd09f68ad7e12..2fb01875b52609c5c0420229ab036dc3b06b022e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
@@ -4,15 +4,14 @@
 
 package org.chromium.chrome.browser;
 
-import android.app.Dialog;
-import android.support.v7.app.AlertDialog;
+import android.preference.PreferenceScreen;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.JsonReader;
-import android.widget.Button;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
+import org.chromium.chrome.browser.preferences.ButtonPreference;
 import org.chromium.chrome.browser.preferences.Preferences;
 import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataDialogFragment;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
@@ -26,7 +25,6 @@ import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
-import org.chromium.content.browser.test.util.TestTouchUtils;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -229,23 +227,9 @@ public class HistoryUITest extends ChromeActivityTestCaseBase<ChromeActivity> {
         assertNotNull("Could not find the preferences activity", prefActivity);
 
         final ClearBrowsingDataDialogFragment clearBrowsingFragment =
-                ActivityUtils.waitForFragment(
-                        prefActivity, ClearBrowsingDataDialogFragment.FRAGMENT_TAG);
+                (ClearBrowsingDataDialogFragment) prefActivity.getFragmentForTest();
         assertNotNull("Could not find clear browsing data fragment", clearBrowsingFragment);
 
-        Dialog dialog = clearBrowsingFragment.getDialog();
-        final Button clearButton = ((AlertDialog) dialog).getButton(
-                AlertDialog.BUTTON_POSITIVE);
-        assertNotNull("Could not find Clear button.", clearButton);
-
-        TestTouchUtils.performClickOnMainSync(getInstrumentation(), clearButton);
-        CriteriaHelper.pollForUIThreadCriteria(new Criteria("Clear browsing dialog never hidden") {
-            @Override
-            public boolean isSatisfied() {
-                return !clearBrowsingFragment.isVisible();
-            }
-        });
-
         final ChromeActivity mainActivity = ActivityUtils.waitForActivity(
                 getInstrumentation(), getActivity().getClass(), new Runnable() {
                     @Override
@@ -253,7 +237,13 @@ public class HistoryUITest extends ChromeActivityTestCaseBase<ChromeActivity> {
                         ThreadUtils.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                prefActivity.finish();
+                                PreferenceScreen screen =

[msramek, 2016/01/28 18:43:49]

Since clicking the "Clear" button in the dialog closes it immediately, and
returns right to the history tab (see the comment in ChromeApplication.java),
this test had to be restructured.

Clicking the button is now the trigger for ActivityUtils.waitForActivity, and
the "clearBrowsingFragment.isVisible()" check had to move below.

+                                        clearBrowsingFragment.getPreferenceScreen();
+                                ButtonPreference clearButton =
+                                        (ButtonPreference) screen.findPreference(
+                                              ClearBrowsingDataDialogFragment.PREF_CLEAR_BUTTON);
+                                clearButton.getOnPreferenceClickListener().onPreferenceClick(
+                                        clearButton);
                             }
                         });
                     }
@@ -262,7 +252,8 @@ public class HistoryUITest extends ChromeActivityTestCaseBase<ChromeActivity> {
         CriteriaHelper.pollForUIThreadCriteria(new Criteria("Main tab never restored") {
             @Override
             public boolean isSatisfied() {
-                return mainActivity.getActivityTab() != null
+                return !clearBrowsingFragment.isVisible()
+                        && mainActivity.getActivityTab() != null
                         && !mainActivity.getActivityTab().isFrozen();
             }
         });