Initial implementation of CronetBidirectionalStream.

components/cronet/android/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 
 assert(!is_component_build, "Cronet requires static library build.")
 
 declare_args() {
   cronet_enable_data_reduction_proxy_support = false
+  cronet_enable_bidirectional_stream = false
 }
 
 generate_jni("cronet_jni_headers") {
   sources = [
     "java/src/org/chromium/net/ChromiumUrlRequest.java",
     "java/src/org/chromium/net/ChromiumUrlRequestContext.java",
+    "java/src/org/chromium/net/CronetBidirectionalStream.java",
     "java/src/org/chromium/net/CronetLibraryLoader.java",
     "java/src/org/chromium/net/CronetUploadDataStream.java",
     "java/src/org/chromium/net/CronetUrlRequest.java",
     "java/src/org/chromium/net/CronetUrlRequestContext.java",
   ]
   jni_package = "cronet"
 }
 
 java_cpp_enum("cronet_url_request_java") {
   sources = [
@@ skipping 63 matching lines @@
 #   defines: Extra defines.
 #   deps: Extra dependencies.
 template("cronet_static_tmpl") {
   source_set(target_name) {
     defines = []
 
     deps = [
       ":cronet_jni_headers",
       ":cronet_url_request_java",
       ":cronet_version_header",
+      ":features",
       "//base",
       "//base:i18n",
       "//base:prefs",
       "//base/third_party/dynamic_annotations",
       "//components/metrics",
     ]
     sources = [
       "//components/cronet/android/chromium_url_request.cc",
       "//components/cronet/android/chromium_url_request.h",
       "//components/cronet/android/chromium_url_request_context.cc",
@@ skipping 35 matching lines @@
     ]
 
     if (cronet_enable_data_reduction_proxy_support) {
       defines += [ "DATA_REDUCTION_PROXY_SUPPORT" ]
       sources += [
         "//components/cronet/android/cronet_data_reduction_proxy.cc",
         "//components/cronet/android/cronet_data_reduction_proxy.h",
       ]
     }
 
+    if (cronet_enable_bidirectional_stream) {
+      sources += [
+        "//components/cronet/android/cronet_bidirectional_stream_adapter.cc",
+        "//components/cronet/android/cronet_bidirectional_stream_adapter.h",
+      ]
+    }
+
     if (defined(invoker.defines)) {
       defines += invoker.defines
     }
 
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
 }
 
@@ skipping 63 matching lines @@
   ]
 
   run_findbugs = true
 }
 
 android_library("cronet_java") {
   java_files = [
     "java/src/org/chromium/net/ChromiumUrlRequest.java",
     "java/src/org/chromium/net/ChromiumUrlRequestContext.java",
     "java/src/org/chromium/net/ChromiumUrlRequestFactory.java",
+    "java/src/org/chromium/net/CronetBidirectionalStream.java",
     "java/src/org/chromium/net/CronetLibraryLoader.java",
     "java/src/org/chromium/net/CronetUploadDataStream.java",
     "java/src/org/chromium/net/CronetUrlRequest.java",
     "java/src/org/chromium/net/CronetUrlRequestContext.java",
     "java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetChunkedOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java",
     "java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java",
     "java/src/org/chromium/net/urlconnection/CronetInputStream.java",
@@ skipping 142 matching lines @@
 }
 
 android_resources("cronet_test_apk_resources") {
   testonly = true
   resource_dirs = [ "test/res" ]
   android_manifest = "test/AndroidManifest.xml"
 }
 
 android_library("cronet_test_apk_java") {
   testonly = true
-  DEPRECATED_java_in_dir = "test/src"
+
+  java_files = [
+    "test/src/org/chromium/net/CronetTestApplication.java",
+    "test/src/org/chromium/net/MockCertVerifier.java",
+    "test/src/org/chromium/net/SdchObserver.java",
+    "test/src/org/chromium/net/CronetTestFramework.java",
+    "test/src/org/chromium/net/MockUrlRequestJobFactory.java",
+    "test/src/org/chromium/net/TestFilesInstaller.java",
+    "test/src/org/chromium/net/CronetTestUtil.java",
+    "test/src/org/chromium/net/NativeTestServer.java",
+    "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
+    "test/src/org/chromium/net/NetworkChangeNotifierUtil.java",
+    "test/src/org/chromium/net/QuicTestServer.java",
+  ]
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     "//base:base_java",
     "//net/android:net_java_test_support",
   ]
+
+  if (cronet_enable_bidirectional_stream) {
+    java_files += [
+      "test/src/org/chromium/net/Http2TestHandler.java",
+      "test/src/org/chromium/net/Http2TestServer.java",
+    ]
+
+    deps += [
+      "//third_party/netty-tcnative:netty-tcnative",
+      "//third_party/netty4:netty_all",
+    ]
+  }
 }
 
 android_assets("cronet_test_apk_assets") {
   testonly = true
 
   # Need to use renaming_sources to maintain subdirectories.
   renaming_sources = [
     "test/assets/test/cacheable.txt",
     "test/assets/test/cacheable.txt.mock-http-headers",
     "test/assets/test/content_length_mismatch.html",
@@ skipping 32 matching lines @@
   native_libs = [ "libcronet_tests.so" ]
   loadable_modules = [ "$root_out_dir/libnetty-tcnative.so" ]
 
   deps = [
     ":cronet_test_apk_assets",
     ":cronet_test_apk_java",
     ":cronet_test_apk_resources",
     ":cronet_tests",
     "//base:base_java",
     "//third_party/netty-tcnative:netty-tcnative_all",
-    "//third_party/netty4:netty_all",
   ]
 
   run_findbugs = true
 }
 
 instrumentation_test_apk("cronet_test_instrumentation_apk") {
   apk_name = "CronetTestInstrumentation"
   apk_under_test = ":cronet_test_apk"
   android_manifest = "test/javatests/AndroidManifest.xml"
-  DEPRECATED_java_in_dir = "test/javatests/src"
+
+  java_files = [
+    "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java",
+    "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java",
+    "test/javatests/src/org/chromium/net/ContextInitTest.java",
+    "test/javatests/src/org/chromium/net/Criteria.java",
+    "test/javatests/src/org/chromium/net/CronetTestBase.java",
+    "test/javatests/src/org/chromium/net/CronetUploadTest.java",
+    "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
+    "test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
+    "test/javatests/src/org/chromium/net/CronetUrlTest.java",
+    "test/javatests/src/org/chromium/net/GetStatusTest.java",
+    "test/javatests/src/org/chromium/net/HttpUrlRequestFactoryTest.java",
+    "test/javatests/src/org/chromium/net/NetworkChangeNotifierTest.java",
+    "test/javatests/src/org/chromium/net/PkpTest.java",
+    "test/javatests/src/org/chromium/net/QuicTest.java",
+    "test/javatests/src/org/chromium/net/SdchTest.java",
+    "test/javatests/src/org/chromium/net/TestDrivenDataProvider.java",
+    "test/javatests/src/org/chromium/net/TestHttpUrlRequestListener.java",
+    "test/javatests/src/org/chromium/net/TestUploadDataProvider.java",
+    "test/javatests/src/org/chromium/net/TestUrlRequestCallback.java",
+    "test/javatests/src/org/chromium/net/UploadTest.java",
+    "test/javatests/src/org/chromium/net/UrlResponseInfoTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetBufferedOutputStreamTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetChunkedOutputStreamTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLConnectionTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandlerTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactoryTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/MessageLoopTest.java",
+    "test/javatests/src/org/chromium/net/urlconnection/TestUtil.java",
+  ]
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
   ]
 
   run_findbugs = true
+
+  if (cronet_enable_bidirectional_stream) {
+    java_files += [
+      "test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
+      "test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java",
+    ]
+  }
 }
 
 test("cronet_unittests") {
   sources = [
     "//components/cronet/histogram_manager_unittest.cc",
     "//components/cronet/run_all_unittests.cc",
     "//components/cronet/url_request_context_config_unittest.cc",
   ]
 
   deps = [
@@ skipping 182 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }
+
+buildflag_header("features") {
+  header = "../cronet_features.h"
+
+  flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$cronet_enable_bidirectional_stream" ]
+}