Move chromium-specific QUIC files net/quic/chromium/

BUG=

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

chrome/browser/io_thread_unittest.cc

@@ -27,8 +27,8 @@
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_auth_scheme.h"
 #include "net/http/http_network_session.h"
+#include "net/quic/chromium/quic_stream_factory.h"
 #include "net/quic/quic_protocol.h"
-#include "net/quic/quic_stream_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/cronet/android/test/quic_test_server.cc

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

components/cronet/ios/test/quic_test_server.cc

@@ -14,7 +14,7 @@
 #include "base/threading/thread.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/quic/crypto/proof_source_chromium.h"
+#include "net/quic/chromium/crypto/proof_source_chromium.h"
 #include "net/spdy/spdy_header_block.h"
 #include "net/test/test_data_directory.h"
 #include "net/tools/quic/quic_in_memory_cache.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/quic_stream_factory.h"
+#include "net/quic/chromium/quic_stream_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 

net/http/http_network_session.cc

@@ -20,11 +20,11 @@
 #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_stream_factory.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_crypto_client_stream_factory.h"
 #include "net/quic/quic_protocol.h"
-#include "net/quic/quic_stream_factory.h"
 #include "net/quic/quic_utils.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_pool_manager_impl.h"

net/http/http_network_session.h

@@ -23,7 +23,7 @@
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_cache.h"
 #include "net/http/http_stream_factory.h"
-#include "net/quic/quic_stream_factory.h"
+#include "net/quic/chromium/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_stream_factory_impl_job.cc

@@ -36,7 +36,7 @@
 #include "net/http/http_stream_factory.h"
 #include "net/http/http_stream_factory_impl_request.h"
 #include "net/log/net_log.h"
-#include "net/quic/quic_http_stream.h"
+#include "net/quic/chromium/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_impl_job.h

@@ -21,7 +21,7 @@
 #include "net/http/http_stream_factory_impl.h"
 #include "net/log/net_log.h"
 #include "net/proxy/proxy_service.h"
-#include "net/quic/quic_stream_factory.h"
+#include "net/quic/chromium/quic_stream_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/ssl_client_socket.h"

net/net.gyp

@@ -825,7 +825,7 @@
         'net_quic_proto',
       ],
       'sources': [
-	'tools/quic/chlo_extractor.h',
+        'tools/quic/chlo_extractor.h',
         'tools/quic/chlo_extractor.cc',
         'tools/quic/quic_client_base.cc',
         'tools/quic/quic_client_base.h',

net/net.gypi

@@ -826,8 +826,37 @@
       'proxy/proxy_server_mac.cc',
       'proxy/proxy_service.cc',
       'proxy/proxy_service.h',
-      'quic/bidirectional_stream_quic_impl.cc',
-      'quic/bidirectional_stream_quic_impl.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/quic_stream_factory.cc',
+      'quic/chromium/quic_stream_factory.h',
+      'quic/chromium/quic_http_stream.cc',
+      'quic/chromium/quic_http_stream.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_connection_logger.cc',
+      'quic/chromium/quic_connection_logger.h',
+      'quic/chromium/quic_utils_chromium.h',
+      'quic/chromium/network_connection.cc',
+      'quic/chromium/network_connection.h',
+      'quic/chromium/port_suggester.cc',
+      'quic/chromium/port_suggester.h',
       'quic/congestion_control/cubic.cc',
       'quic/congestion_control/cubic.h',
       'quic/congestion_control/cubic_bytes.cc',
@@ -868,8 +897,6 @@
       'quic/crypto/chacha20_poly1305_encrypter.h',
       'quic/crypto/channel_id.cc',
       'quic/crypto/channel_id.h',
-      'quic/crypto/channel_id_chromium.cc',
-      'quic/crypto/channel_id_chromium.h',
       'quic/crypto/common_cert_set.cc',
       'quic/crypto/common_cert_set.h',
       'quic/crypto/crypto_framer.cc',
@@ -899,11 +926,7 @@
       'quic/crypto/p256_key_exchange.h',
       'quic/crypto/proof_source.cc',
       'quic/crypto/proof_source.h',
-      'quic/crypto/proof_source_chromium.cc',
-      'quic/crypto/proof_source_chromium.h',
       'quic/crypto/proof_verifier.h',
-      'quic/crypto/proof_verifier_chromium.cc',
-      'quic/crypto/proof_verifier_chromium.h',
       'quic/crypto/properties_based_quic_server_info.cc',
       'quic/crypto/properties_based_quic_server_info.h',
       'quic/crypto/quic_compressed_certs_cache.cc',
@@ -929,10 +952,6 @@
       'quic/interval_set.h',
       'quic/iovector.cc',
       'quic/iovector.h',
-      'quic/network_connection.cc',
-      'quic/network_connection.h',
-      'quic/port_suggester.cc',
-      'quic/port_suggester.h',
       'quic/quic_address_mismatch.cc',
       'quic/quic_address_mismatch.h',
       'quic/quic_alarm.cc',
@@ -944,18 +963,6 @@
       'quic/quic_buffered_packet_store.cc',
       'quic/quic_buffered_packet_store.h',
       'quic/quic_bug_tracker.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_client_promised_info.cc',
       'quic/quic_client_promised_info.h',
       'quic/quic_client_push_promise_index.cc',
@@ -968,8 +975,6 @@
       'quic/quic_config.h',
       'quic/quic_connection.cc',
       'quic/quic_connection.h',
-      'quic/quic_connection_logger.cc',
-      'quic/quic_connection_logger.h',
       'quic/quic_connection_stats.cc',
       'quic/quic_connection_stats.h',
       'quic/quic_crypto_client_stream.cc',
@@ -996,8 +1001,6 @@
       'quic/quic_header_list.h',
       'quic/quic_headers_stream.cc',
       'quic/quic_headers_stream.h',
-      'quic/quic_http_stream.cc',
-      'quic/quic_http_stream.h',
       'quic/quic_http_utils.cc',
       'quic/quic_http_utils.h',
       'quic/quic_multipath_received_packet_manager.cc',
@@ -1033,8 +1036,6 @@
       'quic/quic_spdy_session.h',
       'quic/quic_spdy_stream.cc',
       'quic/quic_spdy_stream.h',
-      'quic/quic_stream_factory.cc',
-      'quic/quic_stream_factory.h',
       'quic/quic_stream_sequencer.cc',
       'quic/quic_stream_sequencer.h',
       'quic/quic_stream_sequencer_buffer.cc',
@@ -1050,7 +1051,6 @@
       'quic/quic_unacked_packet_map.h',
       'quic/quic_utils.cc',
       'quic/quic_utils.h',
-      'quic/quic_utils_chromium.h',
       'quic/quic_write_blocked_list.cc',
       'quic/quic_write_blocked_list.h',
       'quic/reliable_quic_stream.cc',
@@ -1590,7 +1590,22 @@
       'proxy/proxy_server_unittest.cc',
       'proxy/proxy_service_mojo_unittest.cc',
       'proxy/proxy_service_unittest.cc',
-      'quic/bidirectional_stream_quic_impl_unittest.cc',
+      'quic/chromium/bidirectional_stream_quic_impl_unittest.cc',
+      'quic/chromium/crypto/proof_verifier_chromium_test.cc',
+      'quic/chromium/crypto_test_utils_chromium.cc',
+      'quic/chromium/network_connection_unittest.cc',
+      'quic/chromium/port_suggester_unittest.cc',
+      'quic/chromium/quic_chromium_alarm_factory_test.cc',
+      '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_http_stream_test.cc',
+      'quic/chromium/quic_network_transaction_unittest.cc',
+      'quic/chromium/quic_stream_factory_test.cc',
+      'quic/chromium/quic_utils_chromium_test.cc',
+      'quic/chromium/quic_chromium_client_session_peer.cc',
+      'quic/chromium/quic_chromium_client_session_peer.h',
+      'quic/chromium/quic_connection_logger_unittest.cc',
       'quic/congestion_control/cubic_bytes_test.cc',
       'quic/congestion_control/cubic_test.cc',
       'quic/congestion_control/general_loss_algorithm_test.cc',
@@ -1621,7 +1636,6 @@
       'quic/crypto/null_encrypter_test.cc',
       'quic/crypto/p256_key_exchange_test.cc',
       'quic/crypto/proof_test.cc',
-      'quic/crypto/proof_verifier_chromium_test.cc',
       'quic/crypto/properties_based_quic_server_info_test.cc',
       'quic/crypto/quic_compressed_certs_cache_test.cc',
       'quic/crypto/quic_crypto_client_config_test.cc',
@@ -1631,21 +1645,14 @@
       'quic/interval_set_test.cc',
       'quic/interval_test.cc',
       'quic/iovector_test.cc',
-      'quic/network_connection_unittest.cc',
-      'quic/port_suggester_unittest.cc',
       'quic/quic_address_mismatch_test.cc',
       'quic/quic_alarm_test.cc',
       'quic/quic_arena_scoped_ptr_test.cc',
       'quic/quic_bandwidth_test.cc',
       'quic/quic_buffered_packet_store_test.cc',
-      'quic/quic_chromium_alarm_factory_test.cc',
-      'quic/quic_chromium_client_session_test.cc',
-      'quic/quic_chromium_client_stream_test.cc',
-      'quic/quic_chromium_connection_helper_test.cc',
       'quic/quic_client_push_promise_index_test.cc',
       'quic/quic_clock_test.cc',
       'quic/quic_config_test.cc',
-      'quic/quic_connection_logger_unittest.cc',
       'quic/quic_connection_test.cc',
       'quic/quic_crypto_client_stream_test.cc',
       'quic/quic_crypto_server_stream_test.cc',
@@ -1655,12 +1662,10 @@
       'quic/quic_framer_test.cc',
       'quic/quic_header_list_test.cc',
       'quic/quic_headers_stream_test.cc',
-      'quic/quic_http_stream_test.cc',
       'quic/quic_http_utils_test.cc',
       'quic/quic_multipath_received_packet_manager_test.cc',
       'quic/quic_multipath_sent_packet_manager_test.cc',
       'quic/quic_multipath_transmissions_map_test.cc',
-      'quic/quic_network_transaction_unittest.cc',
       'quic/quic_one_block_arena_test.cc',
       'quic/quic_packet_creator_test.cc',
       'quic/quic_packet_generator_test.cc',
@@ -1674,20 +1679,17 @@
       'quic/quic_simple_buffer_allocator_test.cc',
       'quic/quic_socket_address_coder_test.cc',
       'quic/quic_spdy_stream_test.cc',
-      'quic/quic_stream_factory_test.cc',
       'quic/quic_stream_sequencer_test.cc',
       'quic/quic_sustained_bandwidth_recorder_test.cc',
       'quic/quic_time_test.cc',
       'quic/quic_unacked_packet_map_test.cc',
-      'quic/quic_utils_chromium_test.cc',
       'quic/quic_utils_test.cc',
       'quic/quic_write_blocked_list_test.cc',
       'quic/reliable_quic_stream_test.cc',
       'quic/spdy_utils_test.cc',
       'quic/quic_stream_sequencer_buffer_test.cc',
       'quic/test_tools/crypto_test_utils.cc',
       'quic/test_tools/crypto_test_utils.h',
-      'quic/test_tools/crypto_test_utils_chromium.cc',
       'quic/test_tools/crypto_test_utils_test.cc',
       'quic/test_tools/delayed_verify_strike_register_client.cc',
       'quic/test_tools/delayed_verify_strike_register_client.h',
@@ -1705,8 +1707,6 @@
       'quic/test_tools/mock_quic_spdy_client_stream.h',
       'quic/test_tools/mock_random.cc',
       'quic/test_tools/mock_random.h',
-      'quic/test_tools/quic_chromium_client_session_peer.cc',
-      'quic/test_tools/quic_chromium_client_session_peer.h',
       'quic/test_tools/quic_config_peer.cc',
       'quic/test_tools/quic_config_peer.h',
       'quic/test_tools/quic_connection_peer.cc',

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

net/quic/bidirectional_stream_quic_impl.h → net/quic/chromium/bidirectional_stream_quic_impl.h

@@ -14,8 +14,8 @@
 #include "base/memory/weak_ptr.h"
 #include "net/http/bidirectional_stream_impl.h"
 #include "net/log/net_log.h"
-#include "net/quic/quic_chromium_client_session.h"
-#include "net/quic/quic_chromium_client_stream.h"
+#include "net/quic/chromium/quic_chromium_client_session.h"
+#include "net/quic/chromium/quic_chromium_client_stream.h"
 #include "net/spdy/spdy_header_block.h"
 
 namespace base {

net/quic/bidirectional_stream_quic_impl_unittest.cc → net/quic/chromium/bidirectional_stream_quic_impl_unittest.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/bidirectional_stream_quic_impl.h"
+#include "net/quic/chromium/bidirectional_stream_quic_impl.h"
 
 #include <utility>
 
@@ -16,14 +16,14 @@
 #include "net/http/transport_security_state.h"
 #include "net/log/test_net_log.h"
 #include "net/log/test_net_log_util.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/crypto/crypto_protocol.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/crypto/quic_server_info.h"
-#include "net/quic/quic_chromium_alarm_factory.h"
-#include "net/quic/quic_chromium_connection_helper.h"
-#include "net/quic/quic_chromium_packet_reader.h"
-#include "net/quic/quic_chromium_packet_writer.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_http_utils.h"
 #include "net/quic/spdy_utils.h"

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

net/quic/crypto/proof_source_chromium.cc → net/quic/chromium/crypto/proof_source_chromium.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/crypto/proof_source_chromium.h"
+#include "net/quic/chromium/crypto/proof_source_chromium.h"
 
 #include <openssl/digest.h>
 #include <openssl/evp.h>

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

net/quic/crypto/proof_verifier_chromium_test.cc → net/quic/chromium/crypto/proof_verifier_chromium_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/crypto/proof_verifier_chromium.h"
+#include "net/quic/chromium/crypto/proof_verifier_chromium.h"
 
 #include "base/memory/ref_counted.h"
 #include "net/base/net_errors.h"