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

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivityTest.java

Issue 2756173002: Move code about browsing data from PrefServiceBridge to BrowsingDataBridge. (Closed)
Patch Set: fix comments 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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.website; 5 package org.chromium.chrome.browser.preferences.website;
6 6
7 import android.annotation.TargetApi; 7 import android.annotation.TargetApi;
8 import android.content.Intent; 8 import android.content.Intent;
9 import android.os.Build; 9 import android.os.Build;
10 import android.support.test.filters.MediumTest; 10 import android.support.test.filters.MediumTest;
11 import android.support.test.filters.SmallTest; 11 import android.support.test.filters.SmallTest;
12 import android.support.v7.app.AlertDialog; 12 import android.support.v7.app.AlertDialog;
13 13
14 import org.chromium.base.ThreadUtils; 14 import org.chromium.base.ThreadUtils;
15 import org.chromium.base.test.util.CommandLineFlags; 15 import org.chromium.base.test.util.CommandLineFlags;
16 import org.chromium.base.test.util.Feature; 16 import org.chromium.base.test.util.Feature;
17 import org.chromium.base.test.util.MinAndroidSdkLevel; 17 import org.chromium.base.test.util.MinAndroidSdkLevel;
18 import org.chromium.base.test.util.RetryOnFailure; 18 import org.chromium.base.test.util.RetryOnFailure;
19 import org.chromium.chrome.browser.ChromeActivity; 19 import org.chromium.chrome.browser.ChromeActivity;
20 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 20 import org.chromium.chrome.browser.preferences.privacy.BrowsingDataBridge;
21 import org.chromium.chrome.test.ChromeActivityTestCaseBase; 21 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
22 import org.chromium.content.browser.test.util.Criteria; 22 import org.chromium.content.browser.test.util.Criteria;
23 import org.chromium.content.browser.test.util.CriteriaHelper; 23 import org.chromium.content.browser.test.util.CriteriaHelper;
24 import org.chromium.net.test.EmbeddedTestServer; 24 import org.chromium.net.test.EmbeddedTestServer;
25 25
26 /** 26 /**
27 * Tests for ManageSpaceActivity. 27 * Tests for ManageSpaceActivity.
28 */ 28 */
29 @TargetApi(Build.VERSION_CODES.KITKAT) 29 @TargetApi(Build.VERSION_CODES.KITKAT)
30 @CommandLineFlags.Add({"enable-site-engagement"}) 30 @CommandLineFlags.Add({"enable-site-engagement"})
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 loadUrl(cookiesUrl + "#clear"); 117 loadUrl(cookiesUrl + "#clear");
118 assertEquals("false", runJavaScriptCodeInCurrentTab("hasAllStorage()")); 118 assertEquals("false", runJavaScriptCodeInCurrentTab("hasAllStorage()"));
119 runJavaScriptCodeInCurrentTab("setStorage()"); 119 runJavaScriptCodeInCurrentTab("setStorage()");
120 assertEquals("true", runJavaScriptCodeInCurrentTab("hasAllStorage()")); 120 assertEquals("true", runJavaScriptCodeInCurrentTab("hasAllStorage()"));
121 loadUrl("about:blank"); 121 loadUrl("about:blank");
122 122
123 // Now we set the origin as important, and check that we don't clear it. 123 // Now we set the origin as important, and check that we don't clear it.
124 ThreadUtils.runOnUiThreadBlocking(new Runnable() { 124 ThreadUtils.runOnUiThreadBlocking(new Runnable() {
125 @Override 125 @Override
126 public void run() { 126 public void run() {
127 PrefServiceBridge.markOriginAsImportantForTesting(serverOrigin); 127 BrowsingDataBridge.markOriginAsImportantForTesting(serverOrigin) ;
128 } 128 }
129 }); 129 });
130 130
131 ManageSpaceActivity manageSpaceActivity = startManageSpaceActivity(); 131 ManageSpaceActivity manageSpaceActivity = startManageSpaceActivity();
132 // Click 'clear' in the CBD screen. 132 // Click 'clear' in the CBD screen.
133 waitForClearButtonEnabled(manageSpaceActivity); 133 waitForClearButtonEnabled(manageSpaceActivity);
134 ThreadUtils.runOnUiThreadBlocking(getClickClearRunnable(manageSpaceActiv ity)); 134 ThreadUtils.runOnUiThreadBlocking(getClickClearRunnable(manageSpaceActiv ity));
135 // Press 'clear' in our dialog. 135 // Press 'clear' in our dialog.
136 waitForDialogShowing(manageSpaceActivity); 136 waitForDialogShowing(manageSpaceActivity);
137 ThreadUtils.runOnUiThreadBlocking( 137 ThreadUtils.runOnUiThreadBlocking(
(...skipping 16 matching lines...) Expand all
154 waitForDialogShowing(manageSpaceActivity); 154 waitForDialogShowing(manageSpaceActivity);
155 ThreadUtils.runOnUiThreadBlocking( 155 ThreadUtils.runOnUiThreadBlocking(
156 getPressClearRunnable(manageSpaceActivity.getUnimportantConfirmD ialog())); 156 getPressClearRunnable(manageSpaceActivity.getUnimportantConfirmD ialog()));
157 waitForClearButtonEnabled(manageSpaceActivity); 157 waitForClearButtonEnabled(manageSpaceActivity);
158 manageSpaceActivity.finish(); 158 manageSpaceActivity.finish();
159 } 159 }
160 160
161 // TODO(dmurph): Test the other buttons. One should go to the site storage l ist, and the other 161 // TODO(dmurph): Test the other buttons. One should go to the site storage l ist, and the other
162 // should reset all app data. 162 // should reset all app data.
163 } 163 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698