Index: chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java |
index 9a144f07965289adae218e13800d632e140a1996..4cd56f5ee6fde02e7b3b8e7e07579b9eb72038cd 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java |
@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.ChromeActivity; |
import org.chromium.chrome.browser.ChromeSwitches; |
import org.chromium.chrome.browser.infobar.InfoBarContainer; |
import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference; |
-import org.chromium.chrome.browser.preferences.ChromeBaseListPreference; |
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference; |
import org.chromium.chrome.browser.preferences.LocationSettings; |
import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
@@ -260,28 +259,6 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro |
preferenceActivity.finish(); |
} |
- private void setEnableKeygen(final String origin, final boolean enabled) { |
- WebsiteAddress address = WebsiteAddress.create(origin); |
- Website website = new Website(address, address); |
- website.setKeygenInfo(new KeygenInfo(origin, origin, false)); |
- final Preferences preferenceActivity = startSingleWebsitePreferences(website); |
- |
- ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
- @Override |
- public void run() { |
- SingleWebsitePreferences websitePreferences = |
- (SingleWebsitePreferences) preferenceActivity.getFragmentForTest(); |
- ChromeBaseListPreference keygen = |
- (ChromeBaseListPreference) websitePreferences.findPreference( |
- SingleWebsitePreferences.PREF_KEYGEN_PERMISSION); |
- websitePreferences.onPreferenceChange(keygen, enabled |
- ? ContentSetting.ALLOW.toString() |
- : ContentSetting.BLOCK.toString()); |
- } |
- }); |
- preferenceActivity.finish(); |
- } |
- |
private void setEnableBackgroundSync(final boolean enabled) { |
final Preferences preferenceActivity = |
startSiteSettingsCategory(SiteSettingsCategory.CATEGORY_BACKGROUND_SYNC); |
@@ -398,48 +375,6 @@ public class SiteSettingsPreferencesTest extends ChromeActivityTestCaseBase<Chro |
} |
/** |
- * Sets Allow Keygen Enabled to be false and make sure it is set correctly. |
- * @throws Exception |
- */ |
- @SmallTest |
- @Feature({"Preferences"}) |
- public void testKeygenBlocked() throws Exception { |
- final String origin = "http://example.com/"; |
- setEnableKeygen(origin, false); |
- |
- ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
- @Override |
- public void run() { |
- WebsiteAddress address = WebsiteAddress.create(origin); |
- Website site = new Website(address, address); |
- site.setKeygenInfo(new KeygenInfo(origin, origin, false)); |
- assertEquals(site.getKeygenPermission(), ContentSetting.BLOCK); |
- } |
- }); |
- } |
- |
- /** |
- * Sets Allow Keygen Enabled to be true and make sure it is set correctly. |
- * @throws Exception |
- */ |
- @SmallTest |
- @Feature({"Preferences"}) |
- public void testKeygenNotBlocked() throws Exception { |
- final String origin = "http://example.com/"; |
- setEnableKeygen(origin, true); |
- |
- ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
- @Override |
- public void run() { |
- WebsiteAddress address = WebsiteAddress.create(origin); |
- Website site = new Website(address, address); |
- site.setKeygenInfo(new KeygenInfo(origin, origin, false)); |
- assertEquals(site.getKeygenPermission(), ContentSetting.ALLOW); |
- } |
- }); |
- } |
- |
- /** |
* Test that showing the Site Settings menu doesn't crash (crbug.com/610576). |
* @throws Exception |
*/ |