Move various Chromium QUIC files to net/quic/chromium where they belong

Review-Url: https://codereview.chromium.org/2565563002
Cr-Commit-Position: refs/heads/master@{#437345}

net/http/http_network_session.cc

@@ -25,9 +25,9 @@
 #include "net/http/http_stream_factory_impl.h"
 #include "net/http/url_security_manager.h"
 #include "net/proxy/proxy_service.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
 #include "net/quic/chromium/quic_stream_factory.h"
 #include "net/quic/core/crypto/quic_random.h"
-#include "net/quic/core/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_tag.h"
 #include "net/quic/core/quic_utils.h"

net/http/http_stream_factory_impl_unittest.cc

@@ -36,13 +36,13 @@
 #include "net/log/net_log_with_source.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
-#include "net/quic/core/quic_http_utils.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
+#include "net/quic/chromium/quic_http_utils.h"
+#include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/quic/core/quic_server_id.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/mock_random.h"
 #include "net/quic/test_tools/quic_stream_factory_peer.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/mock_client_socket_pool_manager.h"

net/net.gypi

@@ -958,8 +958,12 @@
       'quic/chromium/quic_clock_skew_detector.h',
       'quic/chromium/quic_connection_logger.cc',
       'quic/chromium/quic_connection_logger.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_stream_factory.cc',
       'quic/chromium/quic_stream_factory.h',
       'quic/chromium/quic_utils_chromium.h',
@@ -1118,8 +1122,6 @@
       'quic/core/quic_constants.h',
       'quic/core/quic_crypto_client_stream.cc',
       'quic/core/quic_crypto_client_stream.h',
-      'quic/core/quic_crypto_client_stream_factory.cc',
-      'quic/core/quic_crypto_client_stream_factory.h',
       'quic/core/quic_crypto_server_stream.cc',
       'quic/core/quic_crypto_server_stream.h',
       'quic/core/quic_crypto_stream.cc',
@@ -1142,8 +1144,6 @@
       'quic/core/quic_header_list.h',
       'quic/core/quic_headers_stream.cc',
       'quic/core/quic_headers_stream.h',
-      'quic/core/quic_http_utils.cc',
-      'quic/core/quic_http_utils.h',
       'quic/core/quic_iovector.h',
       'quic/core/quic_multipath_received_packet_manager.cc',
       'quic/core/quic_multipath_received_packet_manager.h',
@@ -1844,6 +1844,8 @@
       'quic/chromium/crypto/proof_test_chromium.cc',
       'quic/chromium/crypto/proof_verifier_chromium_test.cc',
       'quic/chromium/crypto_test_utils_chromium.cc',
+      'quic/chromium/mock_crypto_client_stream_factory.cc',
+      'quic/chromium/mock_crypto_client_stream_factory.h',
       'quic/chromium/mock_network_change_notifier.cc',
       'quic/chromium/mock_network_change_notifier.h',
       'quic/chromium/mock_quic_data.cc',
@@ -1858,8 +1860,11 @@
       'quic/chromium/quic_clock_skew_detector_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_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/core/congestion_control/bandwidth_sampler_test.cc',
       'quic/core/congestion_control/bbr_sender_test.cc',
@@ -1918,7 +1923,6 @@
       'quic/core/quic_framer_test.cc',
       'quic/core/quic_header_list_test.cc',
       'quic/core/quic_headers_stream_test.cc',
-      'quic/core/quic_http_utils_test.cc',
       'quic/core/quic_multipath_received_packet_manager_test.cc',
       'quic/core/quic_multipath_sent_packet_manager_test.cc',
       'quic/core/quic_multipath_transmissions_map_test.cc',
@@ -1960,8 +1964,6 @@
       'quic/test_tools/mock_clock.h',
       'quic/test_tools/mock_crypto_client_stream.cc',
       'quic/test_tools/mock_crypto_client_stream.h',
-      'quic/test_tools/mock_crypto_client_stream_factory.cc',
-      'quic/test_tools/mock_crypto_client_stream_factory.h',
       'quic/test_tools/mock_quic_client_promised_info.cc',
       'quic/test_tools/mock_quic_client_promised_info.h',
       'quic/test_tools/mock_quic_dispatcher.cc',
@@ -2012,8 +2014,6 @@
       'quic/test_tools/quic_stream_sequencer_peer.h',
       'quic/test_tools/quic_sustained_bandwidth_recorder_peer.cc',
       'quic/test_tools/quic_sustained_bandwidth_recorder_peer.h',
-      'quic/test_tools/quic_test_packet_maker.cc',
-      'quic/test_tools/quic_test_packet_maker.h',
       'quic/test_tools/quic_test_utils.cc',
       'quic/test_tools/quic_test_utils.h',
       'quic/test_tools/quic_test_utils_test.cc',

net/quic/chromium/bidirectional_stream_quic_impl_unittest.cc

@@ -20,23 +20,23 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_util.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 #include "net/quic/chromium/quic_chromium_alarm_factory.h"
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
+#include "net/quic/chromium/quic_http_utils.h"
+#include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/mock_random.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/test_task_runner.h"
 #include "net/socket/socket_test_util.h"

net/quic/test_tools/mock_crypto_client_stream_factory.cc → net/quic/chromium/mock_crypto_client_stream_factory.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/test_tools/mock_crypto_client_stream_factory.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 
 #include "base/lazy_instance.h"
 #include "net/quic/chromium/quic_chromium_client_session.h"

net/quic/test_tools/mock_crypto_client_stream_factory.h → net/quic/chromium/mock_crypto_client_stream_factory.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_
-#define NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#ifndef NET_QUIC_CHROMIUM_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#define NET_QUIC_CHROMIUM_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_
 
 #include <queue>
 #include <string>
 
 #include "base/macros.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
-#include "net/quic/core/quic_crypto_client_stream_factory.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/quic_server_id.h"
 #include "net/quic/test_tools/mock_crypto_client_stream.h"
 
@@ -56,4 +56,4 @@ class MockCryptoClientStreamFactory : public QuicCryptoClientStreamFactory {
 
 }  // namespace net
 
-#endif  // NET_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#endif  // NET_QUIC_CHROMIUM_MOCK_CRYPTO_CLIENT_STREAM_FACTORY_H_

net/quic/chromium/quic_chromium_client_session.cc

@@ -26,10 +26,10 @@
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
 #include "net/quic/chromium/quic_stream_factory.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_client_promised_info.h"
-#include "net/quic/core/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/socket/datagram_client_socket.h"
 #include "net/spdy/spdy_http_utils.h"

net/quic/chromium/quic_chromium_client_session_test.cc

@@ -17,26 +17,26 @@
 #include "net/log/net_log_source.h"
 #include "net/log/test_net_log.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 #include "net/quic/chromium/quic_chromium_alarm_factory.h"
 #include "net/quic/chromium/quic_chromium_client_session_peer.h"
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
+#include "net/quic/chromium/quic_http_utils.h"
+#include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/quic/core/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_client_promised_info.h"
-#include "net/quic/core/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/quic_flags.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/core/quic_packet_writer.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/quic_client_promised_info_peer.h"
 #include "net/quic/test_tools/quic_spdy_session_peer.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
 #include "net/socket/datagram_client_socket.h"

net/quic/chromium/quic_chromium_client_stream.cc

@@ -14,7 +14,7 @@
 #include "net/base/net_errors.h"
 #include "net/log/net_log_event_type.h"
 #include "net/quic/chromium/quic_chromium_client_session.h"
-#include "net/quic/core/quic_http_utils.h"
+#include "net/quic/chromium/quic_http_utils.h"
 #include "net/quic/core/quic_spdy_session.h"
 #include "net/quic/core/quic_write_blocked_list.h"
 #include "net/quic/core/spdy_utils.h"

net/quic/core/quic_crypto_client_stream_factory.cc → net/quic/chromium/quic_crypto_client_stream_factory.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/core/quic_crypto_client_stream_factory.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
 
 #include "base/lazy_instance.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"

net/quic/core/quic_crypto_client_stream_factory.h → net/quic/chromium/quic_crypto_client_stream_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_
-#define NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#ifndef NET_QUIC_CHROMIUM_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#define NET_QUIC_CHROMIUM_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_
 
 #include <memory>
 #include <string>
@@ -35,4 +35,4 @@ class NET_EXPORT QuicCryptoClientStreamFactory {
 
 }  // namespace net
 
-#endif  // NET_QUIC_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_
+#endif  // NET_QUIC_CHROMIUM_QUIC_CRYPTO_CLIENT_STREAM_FACTORY_H_

net/quic/chromium/quic_http_stream.cc

@@ -16,8 +16,8 @@
 #include "net/http/http_util.h"
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
+#include "net/quic/chromium/quic_http_utils.h"
 #include "net/quic/core/quic_client_promised_info.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/spdy/spdy_frame_builder.h"

net/quic/chromium/quic_http_stream_test.cc

@@ -27,25 +27,25 @@
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_util.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 #include "net/quic/chromium/quic_chromium_alarm_factory.h"
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
+#include "net/quic/chromium/quic_http_utils.h"
+#include "net/quic/chromium/quic_test_packet_maker.h"
 #include "net/quic/core/congestion_control/send_algorithm_interface.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/core/quic_write_blocked_list.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/mock_random.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/test_task_runner.h"
 #include "net/socket/socket_performance_watcher.h"

net/quic/core/quic_http_utils.cc → net/quic/chromium/quic_http_utils.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/core/quic_http_utils.h"
+#include "net/quic/chromium/quic_http_utils.h"
 
 #include <utility>
 

net/quic/core/quic_http_utils.h → net/quic/chromium/quic_http_utils.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_QUIC_QUIC_HTTP_UTILS_H_
-#define NET_QUIC_QUIC_HTTP_UTILS_H_
+#ifndef NET_QUIC_CHROMIUM_QUIC_HTTP_UTILS_H_
+#define NET_QUIC_CHROMIUM_QUIC_HTTP_UTILS_H_
 
 #include "base/values.h"
 #include "net/base/net_export.h"
@@ -29,4 +29,4 @@ NET_EXPORT std::unique_ptr<base::Value> QuicRequestNetLogCallback(
 
 }  // namespace net
 
-#endif  // NET_QUIC_QUIC_HTTP_UTILS_H_
+#endif  // NET_QUIC_CHROMIUM_QUIC_HTTP_UTILS_H_

net/quic/core/quic_http_utils_test.cc → net/quic/chromium/quic_http_utils_test.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/core/quic_http_utils.h"
+#include "net/quic/chromium/quic_http_utils.h"
 
 #include <stdint.h>
 

net/quic/chromium/quic_network_transaction_unittest.cc

@@ -37,17 +37,17 @@
 #include "net/proxy/proxy_resolver.h"
 #include "net/proxy/proxy_service.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 #include "net/quic/chromium/mock_network_change_notifier.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/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/quic_framer.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/mock_random.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/mock_client_socket_pool_manager.h"

net/quic/chromium/quic_stream_factory.cc

@@ -40,13 +40,13 @@
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/chromium/quic_chromium_packet_reader.h"
 #include "net/quic/chromium/quic_chromium_packet_writer.h"
+#include "net/quic/chromium/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/crypto/proof_verifier.h"
 #include "net/quic/core/crypto/properties_based_quic_server_info.h"
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_client_promised_info.h"
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_crypto_client_stream_factory.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/platform/api/quic_clock.h"
 #include "net/socket/client_socket_factory.h"

net/quic/chromium/quic_stream_factory_test.cc

@@ -25,22 +25,22 @@
 #include "net/http/http_util.h"
 #include "net/http/transport_security_state.h"
 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
+#include "net/quic/chromium/mock_crypto_client_stream_factory.h"
 #include "net/quic/chromium/mock_network_change_notifier.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/core/crypto/crypto_handshake.h"
 #include "net/quic/core/crypto/properties_based_quic_server_info.h"
 #include "net/quic/core/crypto/quic_crypto_client_config.h"
 #include "net/quic/core/crypto/quic_decrypter.h"
 #include "net/quic/core/crypto/quic_encrypter.h"
 #include "net/quic/core/crypto/quic_server_info.h"
 #include "net/quic/core/quic_client_promised_info.h"
-#include "net/quic/core/quic_http_utils.h"
 #include "net/quic/test_tools/mock_clock.h"
-#include "net/quic/test_tools/mock_crypto_client_stream_factory.h"
 #include "net/quic/test_tools/mock_random.h"
 #include "net/quic/test_tools/quic_config_peer.h"
 #include "net/quic/test_tools/quic_stream_factory_peer.h"
-#include "net/quic/test_tools/quic_test_packet_maker.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/test_task_runner.h"
 #include "net/socket/next_proto.h"