Index: components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java |
diff --git a/components/cronet/android/api/src/org/chromium/net/JavaCronetEngine.java b/components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java |
similarity index 83% |
rename from components/cronet/android/api/src/org/chromium/net/JavaCronetEngine.java |
rename to components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java |
index ab19536e7fc18124d751af521fc86d31f468d7fb..02655869f315ec782352696e4ae266a6e0d6c0e9 100644 |
--- a/components/cronet/android/api/src/org/chromium/net/JavaCronetEngine.java |
+++ b/components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java |
@@ -2,11 +2,20 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-package org.chromium.net; |
+package org.chromium.net.impl; |
import static android.os.Process.THREAD_PRIORITY_BACKGROUND; |
import static android.os.Process.THREAD_PRIORITY_MORE_FAVORABLE; |
+import org.chromium.net.ApiVersion; |
+import org.chromium.net.BidirectionalStream; |
+import org.chromium.net.EffectiveConnectionType; |
+import org.chromium.net.ExperimentalBidirectionalStream; |
+import org.chromium.net.NetworkQualityRttListener; |
+import org.chromium.net.NetworkQualityThroughputListener; |
+import org.chromium.net.RequestFinishedInfo; |
+import org.chromium.net.UrlRequest; |
+ |
import java.io.IOException; |
import java.net.Proxy; |
import java.net.URL; |
@@ -26,7 +35,7 @@ import java.util.concurrent.ThreadFactory; |
* |
* <p>Does not support netlogs, transferred data measurement, bidistream, cache, or priority. |
*/ |
-final class JavaCronetEngine extends CronetEngine { |
+public final class JavaCronetEngine extends CronetEngineBase { |
pauljensen
2016/09/26 14:51:22
why public?
kapishnikov
2016/09/27 18:38:26
We are referencing it from the tests that are in a
|
private final String mUserAgent; |
private final ExecutorService mExecutorService = |
@@ -51,12 +60,12 @@ final class JavaCronetEngine extends CronetEngine { |
} |
}); |
- JavaCronetEngine(String userAgent) { |
+ public JavaCronetEngine(String userAgent) { |
this.mUserAgent = userAgent; |
} |
@Override |
- public UrlRequest createRequest(String url, UrlRequest.Callback callback, Executor executor, |
+ public UrlRequestBase createRequest(String url, UrlRequest.Callback callback, Executor executor, |
int priority, Collection<Object> connectionAnnotations, boolean disableCache, |
boolean disableConnectionMigration, boolean allowDirectExecutor) { |
return new JavaUrlRequest( |
@@ -67,13 +76,21 @@ final class JavaCronetEngine extends CronetEngine { |
public BidirectionalStream createBidirectionalStream(String url, |
BidirectionalStream.Callback callback, Executor executor, String httpMethod, |
List<Map.Entry<String, String>> requestHeaders, |
- @BidirectionalStream.Builder.StreamPriority int priority, |
+ @BidirectionalStreamBuilderImpl.StreamPriority int priority, |
boolean delayRequestHeadersUntilFirstFlush, Collection<Object> connectionAnnotations) { |
throw new UnsupportedOperationException( |
"Can't create a bidi stream - httpurlconnection doesn't have those APIs"); |
} |
@Override |
+ public ExperimentalBidirectionalStream.Builder newBidirectionalStreamBuilder( |
+ String url, BidirectionalStream.Callback callback, Executor executor) { |
+ throw new UnsupportedOperationException( |
+ "The bidirectional stream is not supported by the Java implementation " |
pauljensen
2016/09/26 14:51:22
stream->stream API
kapishnikov
2016/09/27 18:38:26
Done.
|
+ + "of Cronet Engine"); |
+ } |
+ |
+ @Override |
public boolean isEnabled() { |
return true; |
} |