Cronet API Refactoring

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index 5ceb9eb46b459983177ad3d47aa750f2f7be311a..c6060e422db513910760c983419ba444a1e95c60 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -34,12 +34,6 @@ java_cpp_enum("effective_connection_type_java") {
   ]
 }
 
-java_cpp_enum("chromium_url_request_java") {
-  sources = [
-    "chromium_url_request.h",
-  ]
-}
-
 java_cpp_enum("net_request_priority_java") {
   sources = [
     "//net/base/request_priority.h",
@@ -58,18 +52,6 @@ java_cpp_enum("url_request_error_java") {
   ]
 }
 
-# This target is a jar file containing classes that Cronet's javadocs
-# may reference but are not included in the javadocs themselves.
-android_library("cronet_javadoc_classpath") {
-  deps = [
-    "//third_party/android_tools:android_support_annotations_java",
-  ]
-  srcjar_deps = [
-    ":effective_connection_type_java",
-    ":url_request_error_java",
-  ]
-}
-
 java_cpp_enum("http_cache_type_java") {
   sources = [
     "//components/cronet/url_request_context_config.h",
@@ -78,12 +60,12 @@ java_cpp_enum("http_cache_type_java") {
 
 java_cpp_template("load_states_list") {
   sources = [
-    "java/src/org/chromium/net/LoadState.template",
+    "java/src/org/chromium/net/impl/LoadState.template",
   ]
   inputs = [
     "//net/base/load_states_list.h",
   ]
-  package_name = "org/chromium/net"
+  package_name = "org/chromium/net/impl"
 }
 
 _generated_api_version_java_dir =
@@ -168,7 +150,6 @@ template("cronet_static_tmpl") {
     defines = []
 
     deps = [
-      ":chromium_url_request_java",
       ":cronet_android_cert_proto",
       ":cronet_jni_headers",
       ":cronet_version_header",
@@ -181,7 +162,6 @@ template("cronet_static_tmpl") {
     sources = [
       "//components/cronet/android/cert/cert_verifier_cache_serializer.cc",
       "//components/cronet/android/cert/cert_verifier_cache_serializer.h",
-      "//components/cronet/android/chromium_url_request.h",
       "//components/cronet/android/cronet_bidirectional_stream_adapter.cc",
       "//components/cronet/android/cronet_bidirectional_stream_adapter.h",
       "//components/cronet/android/cronet_in_memory_pref_store.cc",
@@ -274,6 +254,8 @@ shared_library("cronet") {
   configs -= [ "//build/config/android:hide_native_jni_exports" ]
 }
 
+cronet_api_srcjar_deps = [ ":cronet_api_version_srcjar" ]
+
 # cronet_api.jar defines Cronet API and provides implementation of
 # legacy api using HttpUrlConnection (not the Chromium stack).
 android_library("cronet_api") {
@@ -281,13 +263,13 @@ android_library("cronet_api") {
     "api/src/org/chromium/net/BidirectionalStream.java",
     "api/src/org/chromium/net/CronetEngine.java",
     "api/src/org/chromium/net/CronetException.java",
+    "api/src/org/chromium/net/ICronetEngineBuilder.java",
+    "api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
+    "api/src/org/chromium/net/ExperimentalCronetEngine.java",
+    "api/src/org/chromium/net/ExperimentalUrlRequest.java",
     "api/src/org/chromium/net/InlineExecutionProhibitedException.java",
-    "api/src/org/chromium/net/InputStreamChannel.java",
-    "api/src/org/chromium/net/JavaCronetEngine.java",
-    "api/src/org/chromium/net/JavaUrlRequest.java",
     "api/src/org/chromium/net/NetworkQualityRttListener.java",
     "api/src/org/chromium/net/NetworkQualityThroughputListener.java",
-    "api/src/org/chromium/net/Preconditions.java",
     "api/src/org/chromium/net/QuicException.java",
     "api/src/org/chromium/net/RequestFinishedInfo.java",
     "api/src/org/chromium/net/UploadDataProvider.java",
@@ -296,33 +278,35 @@ android_library("cronet_api") {
     "api/src/org/chromium/net/UrlRequest.java",
     "api/src/org/chromium/net/UrlRequestException.java",
     "api/src/org/chromium/net/UrlResponseInfo.java",
-    "api/src/org/chromium/net/UserAgent.java",
   ]
 
   deps = [
     "//third_party/android_tools:android_support_annotations_java",
   ]
 
-  srcjar_deps = [
-    ":cronet_api_version_srcjar",
-    ":effective_connection_type_java",
-    ":http_cache_type_java",
-    ":url_request_error_java",
-    ":load_states_list",
-    ":network_quality_observation_source_java",
-  ]
+  srcjar_deps = cronet_api_srcjar_deps
 
   run_findbugs_override = true
 }
 
 android_library("cronet_java") {
   java_files = [
+    "java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
     "java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
+    "java/src/org/chromium/net/impl/CronetEngineBase.java",
+    "java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java",
     "java/src/org/chromium/net/impl/CronetLibraryLoader.java",
     "java/src/org/chromium/net/impl/CronetMetrics.java",
     "java/src/org/chromium/net/impl/CronetUploadDataStream.java",
     "java/src/org/chromium/net/impl/CronetUrlRequest.java",
     "java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
+    "java/src/org/chromium/net/impl/InputStreamChannel.java",
+    "java/src/org/chromium/net/impl/JavaCronetEngine.java",
+    "java/src/org/chromium/net/impl/JavaUrlRequest.java",
+    "java/src/org/chromium/net/impl/Preconditions.java",
+    "java/src/org/chromium/net/impl/UrlRequestBase.java",
+    "java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java",
+    "java/src/org/chromium/net/impl/UserAgent.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",
@@ -344,8 +328,12 @@ android_library("cronet_java") {
 
   srcjar_deps = [
     ":cronet_impl_version_srcjar",
-    ":chromium_url_request_java",
+    ":effective_connection_type_java",
+    ":http_cache_type_java",
+    ":load_states_list",
     ":net_request_priority_java",
+    ":network_quality_observation_source_java",
+    ":url_request_error_java",
   ]
 
   run_findbugs_override = true
@@ -354,6 +342,9 @@ android_library("cronet_java") {
 android_resources("cronet_sample_apk_resources") {
   resource_dirs = [ "sample/res" ]
   android_manifest = "sample/AndroidManifest.xml"
+  deps = [
+    "//third_party/android_tools:android_support_v7_appcompat_java",
+  ]
 }
 
 android_library("cronet_sample_apk_java") {
@@ -367,6 +358,7 @@ android_library("cronet_sample_apk_java") {
     ":cronet_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
+    "//third_party/android_tools:android_support_v7_appcompat_java",
   ]
 
   run_findbugs_override = true
@@ -860,10 +852,8 @@ template("jar_src") {
 
 jar_src("jar_cronet_api_source") {
   src_search_dirs = [ "api/src" ]
-
-  # Include generated Java files which should be a part of the API.
-  srcjar_deps = [ ":effective_connection_type_java" ]
   source_deps = [ ":cronet_api" ]
+  srcjar_deps = cronet_api_srcjar_deps
   jar_path = "$_package_dir/cronet_api-src.jar"
 }
 
@@ -944,7 +934,6 @@ action("generate_javadoc") {
     rebase_path("$_package_dir/cronet_api-src.jar", root_build_dir),
   ]
   deps = [
-    ":cronet_javadoc_classpath",
     ":jar_cronet_api_source",
   ]
 }