am 645c1562: Merge "Replace mentions of old JSSE package name"

* commit '645c15629a8abdb9f3a6e428ccb393eacd933552':
  Replace mentions of old JSSE package name

4 files changed, 4 insertions, 4 deletions

diff --git a/benchmarks/src/benchmarks/regression/SignatureBenchmark.java b/benchmarks/src/benchmarks/regression/SignatureBenchmark.java
index 383dcfd..373b876 100644
--- a/benchmarks/src/benchmarks/regression/SignatureBenchmark.java
+++ b/benchmarks/src/benchmarks/regression/SignatureBenchmark.java
@@ -16,6 +16,7 @@
 
 package benchmarks.regression;
 
+import com.android.org.conscrypt.OpenSSLSignature;
 import com.google.caliper.Param;
 import com.google.caliper.SimpleBenchmark;
 import java.security.KeyPair;
@@ -25,7 +26,6 @@ import java.security.PublicKey;
 import java.security.Signature;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.harmony.xnet.provider.jsse.OpenSSLSignature;
 
 /**
  * Tests RSA and DSA signature creation and verification.
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 5d7f716..77e5c7f 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -952,7 +952,7 @@
   name: "tests.api.javax.net.ssl.SSLEngineTest#testHandshake"
 },
 {
-  description: "org.apache.harmony.xnet.provider.jsse.SSLEngineImpl#getDelegatedTask() throws NPE instead of
+  description: "com.android.org.conscrypt.SSLEngineImpl#getDelegatedTask() throws NPE instead of
                 returning null",
   bug: 3403706,
   name: "tests.api.javax.net.ssl.SSLEngineTest#test_getDelegatedTask"
diff --git a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
index 7a1465e..de12967 100644
--- a/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
+++ b/luni/src/test/java/libcore/javax/net/ssl/SSLSocketTest.java
@@ -1215,7 +1215,7 @@ public class SSLSocketTest extends TestCase {
         client.startHandshake();
 
         // Reflection is used so this can compile on the RI
-        String expectedClassName = "org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl";
+        String expectedClassName = "com.android.org.conscrypt.OpenSSLSocketImpl";
         Class actualClass = client.getClass();
         assertEquals(expectedClassName, actualClass.getName());
         Method setSoWriteTimeout = actualClass.getMethod("setSoWriteTimeout",
diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
index 31d0a12..30a1a9c 100644
--- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
+++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
@@ -368,7 +368,7 @@ public class SSLEngineTest extends TestCase {
      * @throws NoSuchAlgorithmException
      * javax.net.ssl.SSLEngine#getDelegatedTask()
      */
-    @KnownFailure("org.apache.harmony.xnet.provider.jsse.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null")
+    @KnownFailure("com.android.org.conscrypt.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null")
     public void test_getDelegatedTask() throws NoSuchAlgorithmException {
         SSLEngine sse = getEngine();
         try {