Index: components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java |
diff --git a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java |
index fa7a540b1c79845c268d99ea43bf18d4f4dc3f4d..bc83435edc932d524188f86816e2d42b9baa7fb5 100644 |
--- a/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java |
+++ b/components/cronet/android/test/javatests/src/org/chromium/net/UploadDataProvidersTest.java |
@@ -72,9 +72,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testFileProvider() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
UploadDataProvider dataProvider = UploadDataProviders.create(mFile); |
builder.setUploadDataProvider(dataProvider, callback.getExecutor()); |
builder.addHeader("Content-Type", "useless/string"); |
@@ -91,9 +90,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
ParcelFileDescriptor.open(mFile, ParcelFileDescriptor.MODE_READ_ONLY); |
assertTrue(descriptor.getFileDescriptor().valid()); |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
UploadDataProvider dataProvider = UploadDataProviders.create(descriptor); |
builder.setUploadDataProvider(dataProvider, callback.getExecutor()); |
builder.addHeader("Content-Type", "useless/string"); |
@@ -107,9 +105,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testBadFileDescriptorProvider() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe(); |
try { |
UploadDataProvider dataProvider = UploadDataProviders.create(pipe[0]); |
@@ -128,9 +125,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testBufferProvider() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
UploadDataProvider dataProvider = UploadDataProviders.create(LOREM.getBytes("UTF-8")); |
builder.setUploadDataProvider(dataProvider, callback.getExecutor()); |
builder.addHeader("Content-Type", "useless/string"); |
@@ -145,8 +141,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testNoErrorWhenCanceledDuringStart() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
final ConditionVariable first = new ConditionVariable(); |
final ConditionVariable second = new ConditionVariable(); |
builder.addHeader("Content-Type", "useless/string"); |
@@ -178,8 +174,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
@Feature({"Cronet"}) |
public void testNoErrorWhenExceptionDuringStart() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
- UrlRequest.Builder builder = new UrlRequest.Builder(NativeTestServer.getEchoBodyURL(), |
- callback, callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getEchoBodyURL(), callback, callback.getExecutor()); |
final ConditionVariable first = new ConditionVariable(); |
final String exceptionMessage = "Bad Length"; |
builder.addHeader("Content-Type", "useless/string"); |
@@ -202,7 +198,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
first.block(); |
callback.blockForDone(); |
assertFalse(callback.mOnCanceledCalled); |
- assertEquals(UrlRequestError.LISTENER_EXCEPTION_THROWN, callback.mError.getErrorCode()); |
+ assertEquals(UrlRequestException.ERROR_LISTENER_EXCEPTION_THROWN, |
+ callback.mError.getErrorCode()); |
assertEquals("Exception received from UploadDataProvider", callback.mError.getMessage()); |
assertEquals(exceptionMessage, callback.mError.getCause().getMessage()); |
} |
@@ -214,9 +211,8 @@ public class UploadDataProvidersTest extends CronetTestBase { |
public void testCreateByteBufferUploadWithArrayOffset() throws Exception { |
TestUrlRequestCallback callback = new TestUrlRequestCallback(); |
// This URL will trigger a rewind(). |
- UrlRequest.Builder builder = |
- new UrlRequest.Builder(NativeTestServer.getRedirectToEchoBody(), callback, |
- callback.getExecutor(), mTestFramework.mCronetEngine); |
+ UrlRequest.Builder builder = mTestFramework.mCronetEngine.newUrlRequestBuilder( |
+ NativeTestServer.getRedirectToEchoBody(), callback, callback.getExecutor()); |
builder.addHeader("Content-Type", "useless/string"); |
byte[] uploadData = LOREM.getBytes("UTF-8"); |
int offset = 5; |