| 1320f92c476a1ad9d19dba2a48c72b75566198e9 |
30-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
hromium_url_request.cc
ronet_jni.cc
ronet_loader.cc
ronet_loader.h
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestContext.java
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
ava/src/org/chromium/net/CronetUrlRequest.java
ava/src/org/chromium/net/CronetUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequestFactoryConfig.java
ava/src/org/chromium/net/LibraryLoader.java
ava/src/org/chromium/net/ResponseInfo.java
ava/src/org/chromium/net/UrlRequest.java
ava/src/org/chromium/net/UrlRequestException.java
ava/src/org/chromium/net/UrlRequestFactory.java
ava/src/org/chromium/net/UrlRequestListener.java
ava/src/org/chromium/net/UsedByReflection.java
ava/src/org/chromium/net/Version.template
roguard.cfg
ample/javatests/proguard.cfg
ample/javatests/src/org/chromium/cronet_sample_apk/ChunkedWritableByteChannelTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSamplePreconditionsTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTestBase.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
est/AndroidManifest.xml
est/assets/test/notfound.html
est/assets/test/notfound.html.mock-http-headers
est/assets/test/redirect.html
est/assets/test/redirect.html.mock-http-headers
est/assets/test/success.txt
est/assets/test/success.txt.mock-http-headers
est/cronet_test_jni.cc
est/javatests/AndroidManifest.xml
est/javatests/src/org/chromium/cronet_test_apk/ChunkedWritableByteChannelTest.java
est/javatests/src/org/chromium/cronet_test_apk/Criteria.java
est/javatests/src/org/chromium/cronet_test_apk/CriteriaHelper.java
est/javatests/src/org/chromium/cronet_test_apk/CronetTestBase.java
est/javatests/src/org/chromium/cronet_test_apk/CronetUrlTest.java
est/javatests/src/org/chromium/cronet_test_apk/HttpUrlRequestFactoryTest.java
est/javatests/src/org/chromium/cronet_test_apk/MockUrlRequestJobTest.java
est/mock_url_request_job_test.cc
est/mock_url_request_job_test.h
est/res/layout/cronet_test_activity.xml
est/res/values/strings.xml
est/src/org/chromium/cronet_test_apk/CronetTestActivity.java
est/src/org/chromium/cronet_test_apk/CronetTestApplication.java
est/src/org/chromium/cronet_test_apk/CronetTestUtil.java
rl_request_adapter.cc
rl_request_adapter.h
rl_request_context_adapter.cc
rl_request_context_adapter.h
|
| 03b57e008b61dfcb1fbad3aea950ae0e001748b0 |
28-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
hromium_url_request.cc
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
rl_request_adapter.cc
rl_request_adapter.h
|
| 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
hromium_url_request.cc
hromium_url_request.h
hromium_url_request_context.cc
hromium_url_request_context.h
hromium_url_request_error_list.h
hromium_url_request_priority_list.h
ronet_jni.cc
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestContext.java
ava/src/org/chromium/net/ChromiumUrlRequestError.template
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
ava/src/org/chromium/net/ChromiumUrlRequestPriority.template
ava/src/org/chromium/net/UrlRequest.java
ava/src/org/chromium/net/UrlRequestContext.java
ava/src/org/chromium/net/UrlRequestError.template
ava/src/org/chromium/net/UrlRequestPriority.template
rg_chromium_net_UrlRequest.cc
rg_chromium_net_UrlRequest.h
rg_chromium_net_UrlRequestContext.cc
rg_chromium_net_UrlRequestContext.h
rg_chromium_net_UrlRequest_error_list.h
rg_chromium_net_UrlRequest_priority_list.h
roguard.cfg
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
rl_request_adapter.cc
rl_request_adapter.h
rl_request_context_adapter.cc
rl_request_context_adapter.h
rl_request_context_peer.cc
rl_request_context_peer.h
rl_request_peer.cc
rl_request_peer.h
rapped_channel_upload_element_reader.cc
rapped_channel_upload_element_reader.h
|
| 5f1c94371a64b3196d4be9466099bb892df9b88e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequest.java
ava/src/org/chromium/net/UrlRequest.java
rg_chromium_net_UrlRequest.cc
ample/AndroidManifest.xml
ample/javatests/AndroidManifest.xml
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
rl_request_peer.cc
rl_request_peer.h
|
| 116680a4aac90f2aa7413d9095a592090648e557 |
21-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ronet_jni.cc
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlRequest.java
ava/src/org/chromium/net/UrlRequest.java
ava/src/org/chromium/net/UrlRequestContext.java
ava/src/org/chromium/net/UserAgent.java
ava/src/org/chromium/net/Version.template
rg_chromium_net_UrlRequest.cc
rg_chromium_net_UrlRequestContext.cc
roguard.cfg
ample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
rl_request_context_peer.cc
rl_request_context_peer.h
rl_request_peer.cc
rl_request_peer.h
rapped_channel_upload_element_reader.cc
rapped_channel_upload_element_reader.h
|
| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestContext.java
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlRequestFactoryConfig.java
ava/src/org/chromium/net/UrlRequestContext.java
ava/src/org/chromium/net/UrlRequestContextConfig.template
rg_chromium_net_UrlRequestContext.cc
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/HttpUrlRequestFactoryTest.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
rl_request_context_peer.cc
rl_request_context_peer.h
|
| cedac228d2dd51db4b79ea1e72c7f249408ee061 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ronet_jni.cc
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequestListener.java
ava/src/org/chromium/net/UrlRequest.java
rg_chromium_net_UrlRequest.cc
rl_request_context_peer.cc
rl_request_peer.cc
rl_request_peer.h
|
| 010d83a9304c5a91596085d917d248abff47903a |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ronet_jni.cc
rg_chromium_net_UrlRequest.cc
rg_chromium_net_UrlRequestContext.cc
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ronet_jni.cc
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequestListener.java
ava/src/org/chromium/net/LibraryLoader.java
rg_chromium_net_UrlRequestContext.cc
rg_chromium_net_UrlRequestContext.h
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ample/src/org/chromium/cronet_sample_apk/LibraryLoader.java
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ava/src/org/chromium/net/UrlRequest.java
ava/src/org/chromium/net/UrlRequestContext.java
rg_chromium_net_UrlRequest.cc
rg_chromium_net_UrlRequest.h
rg_chromium_net_UrlRequestContext.cc
rl_request_context_peer.cc
rl_request_context_peer.h
rl_request_peer.cc
rl_request_peer.h
|
| c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
EPS
ava/src/org/chromium/net/ChromiumUrlRequest.java
ava/src/org/chromium/net/ChromiumUrlRequestContext.java
ava/src/org/chromium/net/ChromiumUrlRequestFactory.java
ava/src/org/chromium/net/ChunkedWritableByteChannel.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequest.java
ava/src/org/chromium/net/HttpUrlConnectionUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlRequest.java
ava/src/org/chromium/net/HttpUrlRequestFactory.java
ava/src/org/chromium/net/HttpUrlRequestListener.java
ava/src/org/chromium/net/ResponseTooLargeException.java
ava/src/org/chromium/net/UrlRequest.java
ava/src/org/chromium/net/UrlRequestContext.java
ava/src/org/chromium/net/UrlRequestError.template
ava/src/org/chromium/net/UrlRequestPriority.template
ava/src/org/chromium/net/UsedByReflection.java
ava/src/org/chromium/net/UserAgent.java
rg_chromium_net_UrlRequest.cc
rg_chromium_net_UrlRequest.h
rg_chromium_net_UrlRequestContext.cc
rg_chromium_net_UrlRequest_error_list.h
rg_chromium_net_UrlRequest_priority_list.h
ample/AndroidManifest.xml
ample/javatests/AndroidManifest.xml
ample/javatests/src/org/chromium/cronet_sample_apk/ChunkedWritableByteChannelTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/Criteria.java
ample/javatests/src/org/chromium/cronet_sample_apk/CriteriaHelper.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSamplePreconditionsTest.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTestBase.java
ample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleUrlTest.java
ample/res/layout/cronet_sample_activity.xml
ample/res/values/strings.xml
ample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
ample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
ample/src/org/chromium/cronet_sample_apk/LibraryLoader.java
rl_request_context_peer.cc
rl_request_context_peer.h
rl_request_peer.cc
rl_request_peer.h
|