Remove zlib divergence

Removed the zlib divergence where we had to replace line like
`#include "third_party/zlib/zlib.h"` with `#include <zlib.h>`. This was
done by creating an actual header file whose path is `third_party/zlib
zlib.h` that will include AOSP's header.

Test: m cronet_aml_net_net && atest net_unittests_tester
Bug: 321680067
Bug: 304217500
Change-Id: Ie794ff71c0d5f9c9083024bb5a3e05f1fadf6171

Author: Mohannad Farrag

components/cronet/android/cronet_library_loader.cc

@@ -6,7 +6,6 @@
 #include <memory>
 #include <string>
 #include <utility>
-#include <zlib.h>
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/build_info.h"
@@ -38,6 +37,7 @@
 #include "net/base/network_change_notifier.h"
 #include "net/proxy_resolution/configured_proxy_resolution_service.h"
 #include "net/proxy_resolution/proxy_config_service_android.h"
+#include "third_party/zlib/zlib.h"
 #include "url/buildflags.h"
 
 #if !BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES)

net/disk_cache/simple/simple_entry_impl.cc

@@ -9,7 +9,6 @@
 #include <limits>
 #include <utility>
 #include <vector>
-#include <zlib.h>
 
 #include "base/check_op.h"
 #include "base/functional/bind.h"
@@ -37,6 +36,7 @@
 #include "net/log/net_log.h"
 #include "net/log/net_log_source_type.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/zlib/zlib.h"
 
 namespace disk_cache {
 namespace {

net/disk_cache/simple/simple_synchronous_entry.cc

@@ -7,7 +7,6 @@
 #include <cstring>
 #include <functional>
 #include <limits>
-#include <zlib.h>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
@@ -35,6 +34,7 @@
 #include "net/disk_cache/simple/simple_util.h"
 #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
+#include "third_party/zlib/zlib.h"
 
 using base::FilePath;
 using base::Time;

net/disk_cache/simple/simple_util.cc

@@ -5,7 +5,6 @@
 #include "net/disk_cache/simple/simple_util.h"
 
 #include <limits>
-#include <zlib.h>
 
 #include "base/check_op.h"
 #include "base/files/file_util.h"
@@ -17,6 +16,7 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "net/disk_cache/simple/simple_entry_format.h"
+#include "third_party/zlib/zlib.h"
 
 namespace {
 

net/disk_cache/simple/simple_version_upgrade.cc

@@ -5,7 +5,6 @@
 #include "net/disk_cache/simple/simple_version_upgrade.h"
 
 #include <cstring>
-#include <zlib.h>
 
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
@@ -17,6 +16,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/simple/simple_backend_version.h"
 #include "net/disk_cache/simple/simple_entry_format_history.h"
+#include "third_party/zlib/zlib.h"
 
 namespace {
 

net/filter/filter_source_stream_test_util.cc

@@ -5,10 +5,10 @@
 #include "net/filter/filter_source_stream_test_util.h"
 
 #include <cstring>
-#include <zlib.h>
 
 #include "base/bit_cast.h"
 #include "base/check_op.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/filter/gzip_header.cc

@@ -7,9 +7,9 @@
 #include <string.h>
 
 #include <algorithm>
-#include <zlib.h>
 
 #include "base/check_op.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/filter/gzip_source_stream.cc

@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <memory>
 #include <utility>
-#include <zlib.h>
 
 #include "base/bit_cast.h"
 #include "base/check_op.h"
@@ -17,6 +16,7 @@
 #include "base/notreached.h"
 #include "base/numerics/checked_math.h"
 #include "net/base/io_buffer.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/filter/gzip_source_stream_unittest.cc

@@ -4,7 +4,6 @@
 
 #include <string>
 #include <utility>
-#include <zlib.h>
 
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
@@ -15,6 +14,7 @@
 #include "net/filter/gzip_source_stream.h"
 #include "net/filter/mock_source_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/http/http_cache_transaction.cc

@@ -32,7 +32,6 @@
 #include "base/strings/string_util.h"  // For EqualsCaseInsensitiveASCII.
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/clock.h"
-#include "base/trace_event/base_tracing.h"
 #include "base/trace_event/common/trace_event_common.h"
 #include "base/values.h"
 #include "net/base/auth.h"

net/http/http_cache_unittest.cc

@@ -29,6 +29,7 @@
 #include "base/test/scoped_feature_list.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/time.h"
+#include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_dump_request_args.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "net/base/cache_type.h"

net/log/trace_net_log_observer_unittest.cc

@@ -17,7 +17,9 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/task_environment.h"
-#include "base/trace_event/base_tracing.h"
+#include "base/trace_event/trace_buffer.h"
+#include "base/trace_event/trace_event.h"
+#include "base/trace_event/trace_event_impl.h"
 #include "base/values.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_event_type.h"

net/socket/ssl_client_socket_impl.cc

@@ -27,7 +27,6 @@
 #include "base/rand_util.h"
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
-#include "base/trace_event/base_tracing.h"
 #include "base/task/sequenced_task_runner.h"
 #include "base/values.h"
 #include "build/build_config.h"

net/spdy/spdy_session.cc

@@ -27,7 +27,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/time/time.h"
-#include "base/trace_event/base_tracing.h"
 #include "base/trace_event/memory_usage_estimator.h"
 #include "base/values.h"
 #include "net/base/features.h"

net/spdy/spdy_session_pool.cc

@@ -12,7 +12,6 @@
 #include "base/functional/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/ranges/algorithm.h"
-#include "base/trace_event/base_tracing.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/values.h"
 #include "build/build_config.h"

net/test/embedded_test_server/controllable_http_response.cc

@@ -7,7 +7,6 @@
 #include "base/check_op.h"
 #include "base/functional/bind.h"
 #include "base/strings/stringprintf.h"
-#include "base/trace_event/base_tracing.h"
 #include "base/task/single_thread_task_runner.h"
 #include "net/base/tracing.h"
 #include "net/test/embedded_test_server/http_response.h"

net/tools/content_decoder_tool/content_decoder_tool_unittest.cc

@@ -8,7 +8,6 @@
 #include <memory>
 #include <ostream>
 #include <utility>
-#include <zlib.h>
 
 #include "base/files/file_util.h"
 #include "base/path_service.h"
@@ -17,6 +16,7 @@
 #include "net/filter/mock_source_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/url_request/url_request_context_builder_unittest.cc

@@ -31,7 +31,6 @@
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
-#include "net/base/cronet_buildflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "url/gurl.h"
@@ -190,7 +189,7 @@ TEST_F(URLRequestContextBuilderTest, CustomHttpAuthHandlerFactory) {
                 host_resolver_.get(), &handler));
 }
 
-#if BUILDFLAG(ENABLE_REPORTING) && !BUILDFLAG(CRONET_BUILD)
+#if BUILDFLAG(ENABLE_REPORTING)
 // See crbug.com/935209. This test ensures that shutdown occurs correctly and
 // does not crash while destoying the NEL and Reporting services in the process
 // of destroying the URLRequestContext whilst Reporting has a pending upload.

net/websockets/websocket_deflater.cc

@@ -8,12 +8,12 @@
 
 #include <algorithm>
 #include <vector>
-#include <zlib.h>
 
 #include "base/check.h"
 #include "base/check_op.h"
 #include "base/containers/circular_deque.h"
 #include "net/base/io_buffer.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

net/websockets/websocket_inflater.cc

@@ -8,11 +8,11 @@
 
 #include <algorithm>
 #include <vector>
-#include <zlib.h>
 
 #include "base/check.h"
 #include "base/check_op.h"
 #include "net/base/io_buffer.h"
+#include "third_party/zlib/zlib.h"
 
 namespace net {
 

third_party/zlib/README.md

@@ -0,0 +1,5 @@
+This directory was created manually and not imported from Chromium. It was created to remove the
+divergence we had where we had to rename `#include "third_party/zlib/zlib.h"` line to
+`#include <zlib.h>`. This is due to the fact that we don't import Chromium's zlib and we use
+zlib from AOSP. In order to workaround that, we redirect traffic from `third_party/zlib/zlib.h` to
+AOSP's zlib.

third_party/zlib/zlib.h

@@ -0,0 +1,12 @@
+// This directory was created manually and not imported from Chromium. It was created to remove the
+// divergence we had where we had to rename `#include "third_party/zlib/zlib.h"` line to
+// `#include <zlib.h>`. This is due to the fact that we don't import Chromium's zlib and we use
+// zlib from AOSP. In order to workaround that, we redirect traffic from `third_party/zlib/zlib.h` to
+// AOSP's zlib.
+
+#ifndef THIRD_PARTY_ZLIB_ZLIB
+#define THIRD_PARTY_ZLIB_ZLIB
+
+#include <zlib.h>
+
+#endif // THIRD_PARTY_ZLIB_ZLIB