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..b30a6a78b301a5608f7a60d79a564adf58d57838 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
@@ -4,17 +4,16 @@
 
 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.preferences.privacy.ClearBrowsingDataPreferences;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
@@ -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;
@@ -228,24 +226,10 @@ public class HistoryUITest extends ChromeActivityTestCaseBase<ChromeActivity> {
                 });
         assertNotNull("Could not find the preferences activity", prefActivity);
 
-        final ClearBrowsingDataDialogFragment clearBrowsingFragment =
-                ActivityUtils.waitForFragment(
-                        prefActivity, ClearBrowsingDataDialogFragment.FRAGMENT_TAG);
+        final ClearBrowsingDataPreferences clearBrowsingFragment =
+                (ClearBrowsingDataPreferences) 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 =
+                                        clearBrowsingFragment.getPreferenceScreen();
+                                ButtonPreference clearButton =
+                                        (ButtonPreference) screen.findPreference(
+                                              ClearBrowsingDataPreferences.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();
             }
         });