Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java

Issue 2671743002: Separate state of basic and advanced tab in CBD dialog (Closed)
Patch Set: rebase and fix compilation Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.preferences.privacy; 5 package org.chromium.chrome.browser.preferences.privacy;
6 6
7 import android.content.Intent; 7 import android.content.Intent;
8 import android.os.AsyncTask; 8 import android.os.AsyncTask;
9 import android.preference.CheckBoxPreference; 9 import android.preference.CheckBoxPreference;
10 import android.preference.Preference; 10 import android.preference.Preference;
11 import android.preference.PreferenceScreen; 11 import android.preference.PreferenceScreen;
12 import android.support.test.filters.LargeTest; 12 import android.support.test.filters.LargeTest;
13 import android.support.test.filters.MediumTest; 13 import android.support.test.filters.MediumTest;
14 import android.support.test.filters.SmallTest; 14 import android.support.test.filters.SmallTest;
15 import android.support.v7.app.AlertDialog; 15 import android.support.v7.app.AlertDialog;
16 import android.text.SpannableString; 16 import android.text.SpannableString;
17 import android.widget.ListView; 17 import android.widget.ListView;
18 18
19 import org.chromium.base.ThreadUtils; 19 import org.chromium.base.ThreadUtils;
20 import org.chromium.base.test.util.CommandLineFlags; 20 import org.chromium.base.test.util.CommandLineFlags;
21 import org.chromium.base.test.util.Feature; 21 import org.chromium.base.test.util.Feature;
22 import org.chromium.base.test.util.RetryOnFailure; 22 import org.chromium.base.test.util.RetryOnFailure;
23 import org.chromium.chrome.browser.ChromeActivity; 23 import org.chromium.chrome.browser.ChromeActivity;
24 import org.chromium.chrome.browser.ChromeFeatureList; 24 import org.chromium.chrome.browser.ChromeFeatureList;
25 import org.chromium.chrome.browser.ShortcutHelper; 25 import org.chromium.chrome.browser.ShortcutHelper;
26 import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTab;
26 import org.chromium.chrome.browser.preferences.ButtonPreference; 27 import org.chromium.chrome.browser.preferences.ButtonPreference;
27 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 28 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
28 import org.chromium.chrome.browser.preferences.Preferences; 29 import org.chromium.chrome.browser.preferences.Preferences;
29 import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferen ces.DialogOption; 30 import org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataPreferen ces.DialogOption;
30 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback; 31 import org.chromium.chrome.browser.webapps.TestFetchStorageCallback;
31 import org.chromium.chrome.browser.webapps.WebappDataStorage; 32 import org.chromium.chrome.browser.webapps.WebappDataStorage;
32 import org.chromium.chrome.browser.webapps.WebappRegistry; 33 import org.chromium.chrome.browser.webapps.WebappRegistry;
33 import org.chromium.chrome.test.ChromeActivityTestCaseBase; 34 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
34 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; 35 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
35 import org.chromium.content.browser.test.util.Criteria; 36 import org.chromium.content.browser.test.util.Criteria;
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 assertEquals("true", runJavaScriptCodeInCurrentTab("hasAllStorage()")); 599 assertEquals("true", runJavaScriptCodeInCurrentTab("hasAllStorage()"));
599 } 600 }
600 601
601 private void setDataTypesToClear(final List<DialogOption> typesToClear) { 602 private void setDataTypesToClear(final List<DialogOption> typesToClear) {
602 ThreadUtils.runOnUiThreadBlocking(new Runnable() { 603 ThreadUtils.runOnUiThreadBlocking(new Runnable() {
603 @Override 604 @Override
604 public void run() { 605 public void run() {
605 for (DialogOption option : DialogOption.values()) { 606 for (DialogOption option : DialogOption.values()) {
606 boolean enabled = typesToClear.contains(option); 607 boolean enabled = typesToClear.contains(option);
607 PrefServiceBridge.getInstance().setBrowsingDataDeletionPrefe rence( 608 PrefServiceBridge.getInstance().setBrowsingDataDeletionPrefe rence(
608 option.getDataType(), enabled); 609 option.getDataType(), ClearBrowsingDataTab.ADVANCED, enabled);
609 } 610 }
610 } 611 }
611 }); 612 });
612 } 613 }
613 } 614 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698