Skip to content

Commit 3e02a92

Browse files
committed
Deleting constants deprecated 5 years ago
1 parent 9219778 commit 3e02a92

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@ public static final class SystemProperty {
9999
public static final String PROFILE = "firefox_profile";
100100
public static final String MARIONETTE = "marionette";
101101

102-
// Accept untrusted SSL certificates.
103-
@Deprecated
104-
public static final boolean ACCEPT_UNTRUSTED_CERTIFICATES = true;
105-
// Assume that the untrusted certificates will come from untrusted issuers
106-
// or will be self signed.
107-
@Deprecated
108-
public static final boolean ASSUME_UNTRUSTED_ISSUER = true;
109-
110102
protected FirefoxBinary binary;
111103

112104
public FirefoxDriver() {

java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
package org.openqa.selenium.firefox;
1919

20-
import static org.openqa.selenium.firefox.FirefoxDriver.ACCEPT_UNTRUSTED_CERTIFICATES;
21-
import static org.openqa.selenium.firefox.FirefoxDriver.ASSUME_UNTRUSTED_ISSUER;
22-
2320
import com.google.common.annotations.VisibleForTesting;
2421
import com.google.common.collect.Maps;
2522
import com.google.common.io.Resources;
@@ -90,14 +87,12 @@ protected FirefoxProfile(Reader defaultsReader, File profileDir) {
9087
if (prefsInModel.exists()) {
9188
StringReader reader = new StringReader("{\"frozen\": {}, \"mutable\": {}}");
9289
Preferences existingPrefs = new Preferences(reader, prefsInModel);
93-
acceptUntrustedCerts = getBooleanPreference(existingPrefs, ACCEPT_UNTRUSTED_CERTS_PREF,
94-
ACCEPT_UNTRUSTED_CERTIFICATES);
95-
untrustedCertIssuer = getBooleanPreference(existingPrefs, ASSUME_UNTRUSTED_ISSUER_PREF,
96-
ASSUME_UNTRUSTED_ISSUER);
90+
acceptUntrustedCerts = getBooleanPreference(existingPrefs, ACCEPT_UNTRUSTED_CERTS_PREF, true);
91+
untrustedCertIssuer = getBooleanPreference(existingPrefs, ASSUME_UNTRUSTED_ISSUER_PREF, true);
9792
existingPrefs.addTo(additionalPrefs);
9893
} else {
99-
acceptUntrustedCerts = ACCEPT_UNTRUSTED_CERTIFICATES;
100-
untrustedCertIssuer = ASSUME_UNTRUSTED_ISSUER;
94+
acceptUntrustedCerts = true;
95+
untrustedCertIssuer = true;
10196
}
10297

10398
// This is not entirely correct but this is not stored in the profile

0 commit comments

Comments
 (0)