Move chromium-specific QUIC code from net/quic/chromium/ to net/quic/.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: Ic1203515dfdb853ff076aa838bc27ff008f1b187
Reviewed-on: https://chromium-review.googlesource.com/1150614
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Reviewed-by: Abhishek Arya <inferno@chromium.org>
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579959}

chrome/browser/io_thread.cc

@@ -74,7 +74,7 @@
 #include "net/proxy_resolution/pac_file_fetcher_impl.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/quic/chromium/quic_utils_chromium.h"
+#include "net/quic/quic_utils_chromium.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_key_logger_impl.h"
 #include "net/url_request/url_fetcher.h"

components/cronet/android/test/quic_test_server.cc

@@ -15,7 +15,7 @@
 #include "jni/QuicTestServer_jni.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/quic/chromium/crypto/proof_source_chromium.h"
+#include "net/quic/crypto/proof_source_chromium.h"
 #include "net/test/test_data_directory.h"
 #include "net/third_party/quic/tools/quic_memory_cache_backend.h"
 #include "net/tools/quic/quic_simple_server.h"

components/cronet/url_request_context_config.cc

@@ -28,7 +28,7 @@
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/nqe/network_quality_estimator_params.h"
-#include "net/quic/chromium/quic_utils_chromium.h"
+#include "net/quic/quic_utils_chromium.h"
 #include "net/reporting/reporting_policy.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/ssl/ssl_key_logger_impl.h"

components/network_session_configurator/browser/network_session_configurator.cc

@@ -23,7 +23,7 @@
 #include "components/variations/variations_associated_data.h"
 #include "net/base/host_mapping_rules.h"
 #include "net/http/http_stream_factory.h"
-#include "net/quic/chromium/quic_utils_chromium.h"
+#include "net/quic/quic_utils_chromium.h"
 #include "net/third_party/quic/core/quic_packets.h"
 #include "net/third_party/spdy/core/spdy_protocol.h"
 

ios/net/http_cache_helper.cc

@@ -16,7 +16,7 @@
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
-#include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"

net/BUILD.gn

@@ -946,54 +946,54 @@ component("net") {
       "proxy_resolution/proxy_resolver_winhttp.cc",
       "proxy_resolution/proxy_resolver_winhttp.h",
       "proxy_resolution/proxy_retry_info.h",
-      "quic/chromium/bidirectional_stream_quic_impl.cc",
-      "quic/chromium/bidirectional_stream_quic_impl.h",
-      "quic/chromium/crypto/channel_id_chromium.cc",
-      "quic/chromium/crypto/channel_id_chromium.h",
-      "quic/chromium/crypto/proof_source_chromium.cc",
-      "quic/chromium/crypto/proof_source_chromium.h",
-      "quic/chromium/crypto/proof_verifier_chromium.cc",
-      "quic/chromium/crypto/proof_verifier_chromium.h",
-      "quic/chromium/network_connection.cc",
-      "quic/chromium/network_connection.h",
-      "quic/chromium/properties_based_quic_server_info.cc",
-      "quic/chromium/properties_based_quic_server_info.h",
-      "quic/chromium/quic_address_mismatch.cc",
-      "quic/chromium/quic_address_mismatch.h",
-      "quic/chromium/quic_chromium_alarm_factory.cc",
-      "quic/chromium/quic_chromium_alarm_factory.h",
-      "quic/chromium/quic_chromium_client_session.cc",
-      "quic/chromium/quic_chromium_client_session.h",
-      "quic/chromium/quic_chromium_client_stream.cc",
-      "quic/chromium/quic_chromium_client_stream.h",
-      "quic/chromium/quic_chromium_connection_helper.cc",
-      "quic/chromium/quic_chromium_connection_helper.h",
-      "quic/chromium/quic_chromium_packet_reader.cc",
-      "quic/chromium/quic_chromium_packet_reader.h",
-      "quic/chromium/quic_chromium_packet_writer.cc",
-      "quic/chromium/quic_chromium_packet_writer.h",
-      "quic/chromium/quic_clock_skew_detector.cc",
-      "quic/chromium/quic_clock_skew_detector.h",
-      "quic/chromium/quic_connection_logger.cc",
-      "quic/chromium/quic_connection_logger.h",
-      "quic/chromium/quic_connectivity_probing_manager.cc",
-      "quic/chromium/quic_connectivity_probing_manager.h",
-      "quic/chromium/quic_crypto_client_stream_factory.cc",
-      "quic/chromium/quic_crypto_client_stream_factory.h",
-      "quic/chromium/quic_http_stream.cc",
-      "quic/chromium/quic_http_stream.h",
-      "quic/chromium/quic_http_utils.cc",
-      "quic/chromium/quic_http_utils.h",
-      "quic/chromium/quic_proxy_client_socket.cc",
-      "quic/chromium/quic_proxy_client_socket.h",
-      "quic/chromium/quic_server_info.cc",
-      "quic/chromium/quic_server_info.h",
-      "quic/chromium/quic_session_key.cc",
-      "quic/chromium/quic_session_key.h",
-      "quic/chromium/quic_stream_factory.cc",
-      "quic/chromium/quic_stream_factory.h",
-      "quic/chromium/quic_utils_chromium.cc",
-      "quic/chromium/quic_utils_chromium.h",
+      "quic/bidirectional_stream_quic_impl.cc",
+      "quic/bidirectional_stream_quic_impl.h",
+      "quic/crypto/channel_id_chromium.cc",
+      "quic/crypto/channel_id_chromium.h",
+      "quic/crypto/proof_source_chromium.cc",
+      "quic/crypto/proof_source_chromium.h",
+      "quic/crypto/proof_verifier_chromium.cc",
+      "quic/crypto/proof_verifier_chromium.h",
+      "quic/network_connection.cc",
+      "quic/network_connection.h",
+      "quic/properties_based_quic_server_info.cc",
+      "quic/properties_based_quic_server_info.h",
+      "quic/quic_address_mismatch.cc",
+      "quic/quic_address_mismatch.h",
+      "quic/quic_chromium_alarm_factory.cc",
+      "quic/quic_chromium_alarm_factory.h",
+      "quic/quic_chromium_client_session.cc",
+      "quic/quic_chromium_client_session.h",
+      "quic/quic_chromium_client_stream.cc",
+      "quic/quic_chromium_client_stream.h",
+      "quic/quic_chromium_connection_helper.cc",
+      "quic/quic_chromium_connection_helper.h",
+      "quic/quic_chromium_packet_reader.cc",
+      "quic/quic_chromium_packet_reader.h",
+      "quic/quic_chromium_packet_writer.cc",
+      "quic/quic_chromium_packet_writer.h",
+      "quic/quic_clock_skew_detector.cc",
+      "quic/quic_clock_skew_detector.h",
+      "quic/quic_connection_logger.cc",
+      "quic/quic_connection_logger.h",
+      "quic/quic_connectivity_probing_manager.cc",
+      "quic/quic_connectivity_probing_manager.h",
+      "quic/quic_crypto_client_stream_factory.cc",
+      "quic/quic_crypto_client_stream_factory.h",
+      "quic/quic_http_stream.cc",
+      "quic/quic_http_stream.h",
+      "quic/quic_http_utils.cc",
+      "quic/quic_http_utils.h",
+      "quic/quic_proxy_client_socket.cc",
+      "quic/quic_proxy_client_socket.h",
+      "quic/quic_server_info.cc",
+      "quic/quic_server_info.h",
+      "quic/quic_session_key.cc",
+      "quic/quic_session_key.h",
+      "quic/quic_stream_factory.cc",
+      "quic/quic_stream_factory.h",
+      "quic/quic_utils_chromium.cc",
+      "quic/quic_utils_chromium.h",
       "socket/client_socket_factory.cc",
       "socket/client_socket_factory.h",
       "socket/client_socket_pool.cc",
@@ -3029,7 +3029,7 @@ if (is_android || is_linux) {
 source_set("quic_test_tools") {
   testonly = true
   sources = [
-    "quic/chromium/crypto_test_utils_chromium.cc",
+    "quic/crypto_test_utils_chromium.cc",
     "third_party/quic/core/quic_trace_visitor.cc",
     "third_party/quic/core/quic_trace_visitor.h",
     "third_party/quic/platform/api/quic_expect_bug.h",
@@ -4830,37 +4830,37 @@ test("net_unittests") {
     "proxy_resolution/proxy_resolver_v8_tracing_wrapper_unittest.cc",
     "proxy_resolution/proxy_resolver_v8_unittest.cc",
     "proxy_resolution/proxy_server_unittest.cc",
-    "quic/chromium/bidirectional_stream_quic_impl_unittest.cc",
-    "quic/chromium/crypto/proof_test_chromium.cc",
-    "quic/chromium/crypto/proof_verifier_chromium_test.cc",
-    "quic/chromium/mock_crypto_client_stream_factory.cc",
-    "quic/chromium/mock_crypto_client_stream_factory.h",
-    "quic/chromium/mock_quic_data.cc",
-    "quic/chromium/mock_quic_data.h",
-    "quic/chromium/network_connection_unittest.cc",
-    "quic/chromium/properties_based_quic_server_info_test.cc",
-    "quic/chromium/quic_address_mismatch_test.cc",
-    "quic/chromium/quic_chromium_alarm_factory_test.cc",
-    "quic/chromium/quic_chromium_client_session_peer.cc",
-    "quic/chromium/quic_chromium_client_session_peer.h",
-    "quic/chromium/quic_chromium_client_session_test.cc",
-    "quic/chromium/quic_chromium_client_stream_test.cc",
-    "quic/chromium/quic_chromium_connection_helper_test.cc",
-    "quic/chromium/quic_clock_skew_detector_test.cc",
-    "quic/chromium/quic_connectivity_probing_manager_test.cc",
-    "quic/chromium/quic_end_to_end_unittest.cc",
-    "quic/chromium/quic_http_stream_test.cc",
-    "quic/chromium/quic_http_utils_test.cc",
-    "quic/chromium/quic_network_transaction_unittest.cc",
-    "quic/chromium/quic_proxy_client_socket_unittest.cc",
-    "quic/chromium/quic_stream_factory_peer.cc",
-    "quic/chromium/quic_stream_factory_peer.h",
-    "quic/chromium/quic_stream_factory_test.cc",
-    "quic/chromium/quic_test_packet_maker.cc",
-    "quic/chromium/quic_test_packet_maker.h",
-    "quic/chromium/quic_utils_chromium_test.cc",
-    "quic/chromium/test_task_runner.cc",
-    "quic/chromium/test_task_runner.h",
+    "quic/bidirectional_stream_quic_impl_unittest.cc",
+    "quic/crypto/proof_test_chromium.cc",
+    "quic/crypto/proof_verifier_chromium_test.cc",
+    "quic/mock_crypto_client_stream_factory.cc",
+    "quic/mock_crypto_client_stream_factory.h",
+    "quic/mock_quic_data.cc",
+    "quic/mock_quic_data.h",
+    "quic/network_connection_unittest.cc",
+    "quic/properties_based_quic_server_info_test.cc",
+    "quic/quic_address_mismatch_test.cc",
+    "quic/quic_chromium_alarm_factory_test.cc",
+    "quic/quic_chromium_client_session_peer.cc",
+    "quic/quic_chromium_client_session_peer.h",
+    "quic/quic_chromium_client_session_test.cc",
+    "quic/quic_chromium_client_stream_test.cc",
+    "quic/quic_chromium_connection_helper_test.cc",
+    "quic/quic_clock_skew_detector_test.cc",
+    "quic/quic_connectivity_probing_manager_test.cc",
+    "quic/quic_end_to_end_unittest.cc",
+    "quic/quic_http_stream_test.cc",
+    "quic/quic_http_utils_test.cc",
+    "quic/quic_network_transaction_unittest.cc",
+    "quic/quic_proxy_client_socket_unittest.cc",
+    "quic/quic_stream_factory_peer.cc",
+    "quic/quic_stream_factory_peer.h",
+    "quic/quic_stream_factory_test.cc",
+    "quic/quic_test_packet_maker.cc",
+    "quic/quic_test_packet_maker.h",
+    "quic/quic_utils_chromium_test.cc",
+    "quic/test_task_runner.cc",
+    "quic/test_task_runner.h",
     "third_party/http2/decoder/decode_buffer_test.cc",
     "third_party/http2/decoder/decode_http2_structures_test.cc",
     "third_party/http2/decoder/frame_decoder_state_test_util.cc",
@@ -6185,11 +6185,11 @@ fuzzer_test("net_reporting_header_parser_fuzzer") {
 
 fuzzer_test("net_quic_stream_factory_fuzzer") {
   sources = [
-    "quic/chromium/mock_crypto_client_stream_factory.cc",
-    "quic/chromium/mock_crypto_client_stream_factory.h",
-    "quic/chromium/quic_stream_factory_fuzzer.cc",
-    "quic/chromium/test_task_runner.cc",
-    "quic/chromium/test_task_runner.h",
+    "quic/mock_crypto_client_stream_factory.cc",
+    "quic/mock_crypto_client_stream_factory.h",
+    "quic/quic_stream_factory_fuzzer.cc",
+    "quic/test_task_runner.cc",
+    "quic/test_task_runner.h",
   ]
 
   deps = [

net/http/http_cache.cc

@@ -47,7 +47,7 @@
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 #include "net/log/net_log_with_source.h"
-#include "net/quic/chromium/quic_server_info.h"
+#include "net/quic/quic_server_info.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>

net/http/http_network_session.cc

@@ -25,8 +25,8 @@
 #include "net/http/http_stream_factory.h"
 #include "net/http/url_security_manager.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
-#include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/quic_crypto_client_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_pool_manager_impl.h"
 #include "net/socket/next_proto.h"

net/http/http_network_session.h

@@ -28,7 +28,7 @@
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_cache.h"
 #include "net/http/http_stream_factory.h"
-#include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/ssl/ssl_client_auth_cache.h"

net/http/http_proxy_client_socket_wrapper.cc

@@ -17,8 +17,8 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
-#include "net/quic/chromium/quic_http_utils.h"
-#include "net/quic/chromium/quic_proxy_client_socket.h"
+#include "net/quic/quic_http_utils.h"
+#include "net/quic/quic_proxy_client_socket.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/socket_tag.h"

net/http/http_proxy_client_socket_wrapper.h

@@ -21,7 +21,7 @@
 #include "net/http/http_auth_controller.h"
 #include "net/http/proxy_client_socket.h"
 #include "net/log/net_log_with_source.h"
-#include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/ssl_client_socket_pool.h"

net/http/http_proxy_client_socket_wrapper_unittest.cc

@@ -16,10 +16,10 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/transport_security_state.h"
-#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
-#include "net/quic/chromium/mock_quic_data.h"
-#include "net/quic/chromium/quic_http_utils.h"
-#include "net/quic/chromium/quic_test_packet_maker.h"
+#include "net/quic/mock_crypto_client_stream_factory.h"
+#include "net/quic/mock_quic_data.h"
+#include "net/quic/quic_http_utils.h"
+#include "net/quic/quic_test_packet_maker.h"
 #include "net/socket/socket_tag.h"
 #include "net/socket/socket_test_util.h"
 #include "net/ssl/channel_id_service.h"

net/http/http_stream_factory.cc

@@ -28,7 +28,7 @@
 #include "net/http/http_stream_factory_job.h"
 #include "net/http/http_stream_factory_job_controller.h"
 #include "net/http/transport_security_state.h"
-#include "net/quic/chromium/quic_http_utils.h"
+#include "net/quic/quic_http_utils.h"
 #include "net/spdy/bidirectional_stream_spdy_impl.h"
 #include "net/spdy/spdy_http_stream.h"
 #include "net/third_party/quic/core/quic_packets.h"

net/http/http_stream_factory_job.cc

@@ -40,8 +40,8 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
-#include "net/quic/chromium/bidirectional_stream_quic_impl.h"
-#include "net/quic/chromium/quic_http_stream.h"
+#include "net/quic/bidirectional_stream_quic_impl.h"
+#include "net/quic/quic_http_stream.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/client_socket_pool_manager.h"

net/http/http_stream_factory_job.h

@@ -24,7 +24,7 @@
 #include "net/http/http_stream_request.h"
 #include "net/log/net_log_with_source.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/quic/chromium/quic_stream_factory.h"
+#include "net/quic/quic_stream_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/next_proto.h"

net/http/http_stream_factory_job_controller_unittest.cc

@@ -35,11 +35,11 @@
 #include "net/proxy_resolution/proxy_config_service_fixed.h"
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
-#include "net/quic/chromium/mock_quic_data.h"
-#include "net/quic/chromium/quic_stream_factory.h"
-#include "net/quic/chromium/quic_stream_factory_peer.h"
-#include "net/quic/chromium/quic_test_packet_maker.h"
+#include "net/quic/mock_crypto_client_stream_factory.h"
+#include "net/quic/mock_quic_data.h"
+#include "net/quic/quic_stream_factory.h"
+#include "net/quic/quic_stream_factory_peer.h"
+#include "net/quic/quic_test_packet_maker.h"
 #include "net/socket/socket_test_util.h"
 #include "net/spdy/spdy_test_util_common.h"
 #include "net/test/test_with_scoped_task_environment.h"

net/http/http_stream_factory_unittest.cc

@@ -42,10 +42,10 @@
 #include "net/log/net_log_with_source.h"
 #include "net/proxy_resolution/proxy_info.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
-#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
-#include "net/quic/chromium/quic_http_utils.h"
-#include "net/quic/chromium/quic_stream_factory_peer.h"
-#include "net/quic/chromium/quic_test_packet_maker.h"
+#include "net/quic/mock_crypto_client_stream_factory.h"
+#include "net/quic/quic_http_utils.h"
+#include "net/quic/quic_stream_factory_peer.h"
+#include "net/quic/quic_test_packet_maker.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/mock_client_socket_pool_manager.h"
 #include "net/socket/next_proto.h"

net/quic/chromium/bidirectional_stream_quic_impl.cc → net/quic/bidirectional_stream_quic_impl.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/quic/chromium/bidirectional_stream_quic_impl.h"
+#include "net/quic/bidirectional_stream_quic_impl.h"
 
 #include <utility>