Move a number of chromium-specific QUIC files to net/quic/

Change-Id: I567c131eaedfe6c232afb61afb74b83da19c7017
Reviewed-on: https://chromium-review.googlesource.com/1150685
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579965}

net/BUILD.gn

@@ -980,6 +980,7 @@ component("net") {
       "quic/quic_connectivity_probing_manager.h",
       "quic/quic_crypto_client_stream_factory.cc",
       "quic/quic_crypto_client_stream_factory.h",
+      "quic/quic_flags_list.h",
       "quic/quic_http_stream.cc",
       "quic/quic_http_stream.h",
       "quic/quic_http_utils.cc",
@@ -1410,7 +1411,6 @@ component("net") {
       "third_party/quic/core/quic_data_reader.h",
       "third_party/quic/core/quic_data_writer.cc",
       "third_party/quic/core/quic_data_writer.h",
-      "third_party/quic/core/quic_flags_list.h",
       "third_party/quic/core/quic_flow_controller.cc",
       "third_party/quic/core/quic_flow_controller.h",
       "third_party/quic/core/quic_framer.cc",
@@ -3030,6 +3030,16 @@ source_set("quic_test_tools") {
   testonly = true
   sources = [
     "quic/crypto_test_utils_chromium.cc",
+    "quic/mock_crypto_client_stream.cc",
+    "quic/mock_crypto_client_stream.h",
+    "quic/mock_crypto_client_stream_factory.cc",
+    "quic/mock_crypto_client_stream_factory.h",
+    "quic/mock_decrypter.cc",
+    "quic/mock_decrypter.h",
+    "quic/mock_encrypter.cc",
+    "quic/mock_encrypter.h",
+    "quic/test_task_runner.cc",
+    "quic/test_task_runner.h",
     "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",
@@ -3057,12 +3067,6 @@ source_set("quic_test_tools") {
     "third_party/quic/test_tools/fake_proof_source.h",
     "third_party/quic/test_tools/mock_clock.cc",
     "third_party/quic/test_tools/mock_clock.h",
-    "third_party/quic/test_tools/mock_crypto_client_stream.cc",
-    "third_party/quic/test_tools/mock_crypto_client_stream.h",
-    "third_party/quic/test_tools/mock_decrypter.cc",
-    "third_party/quic/test_tools/mock_decrypter.h",
-    "third_party/quic/test_tools/mock_encrypter.cc",
-    "third_party/quic/test_tools/mock_encrypter.h",
     "third_party/quic/test_tools/mock_quic_client_promised_info.cc",
     "third_party/quic/test_tools/mock_quic_client_promised_info.h",
     "third_party/quic/test_tools/mock_quic_dispatcher.cc",
@@ -4833,8 +4837,6 @@ test("net_unittests") {
     "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",
@@ -4859,8 +4861,6 @@ test("net_unittests") {
     "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",
@@ -5976,7 +5976,7 @@ fuzzer_test("net_parse_url_hostname_to_address_fuzzer") {
 
 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") {
   sources = [
-    "third_party/quic/core/quic_crypto_framer_parse_message_fuzzer.cc",
+    "quic/quic_crypto_framer_parse_message_fuzzer.cc",
   ]
   deps = [
     ":net_fuzzer_test_support",
@@ -6185,11 +6185,7 @@ fuzzer_test("net_reporting_header_parser_fuzzer") {
 
 fuzzer_test("net_quic_stream_factory_fuzzer") {
   sources = [
-    "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/third_party/quic/test_tools/mock_crypto_client_stream.cc → net/quic/mock_crypto_client_stream.cc

@@ -2,20 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/third_party/quic/test_tools/mock_crypto_client_stream.h"
+#include "net/quic/mock_crypto_client_stream.h"
 
+#include "net/quic/mock_decrypter.h"
+#include "net/quic/mock_encrypter.h"
 #include "net/third_party/quic/core/crypto/null_decrypter.h"
 #include "net/third_party/quic/core/crypto/null_encrypter.h"
 #include "net/third_party/quic/core/crypto/quic_decrypter.h"
 #include "net/third_party/quic/core/crypto/quic_encrypter.h"
 #include "net/third_party/quic/core/http/quic_spdy_client_session_base.h"
 #include "net/third_party/quic/platform/api/quic_ptr_util.h"
-#include "net/third_party/quic/test_tools/mock_decrypter.h"
-#include "net/third_party/quic/test_tools/mock_encrypter.h"
 #include "net/third_party/quic/test_tools/quic_config_peer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-
 namespace quic {
 
 MockCryptoClientStream::MockCryptoClientStream(

net/third_party/quic/test_tools/mock_crypto_client_stream.h → net/quic/mock_crypto_client_stream.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_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
-#define NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
+#ifndef NET_QUIC_MOCK_CRYPTO_CLIENT_STREAM_H_
+#define NET_QUIC_MOCK_CRYPTO_CLIENT_STREAM_H_
 
 #include <string>
 
@@ -94,4 +94,4 @@ class MockCryptoClientStream : public QuicCryptoClientStream,
 
 }  // namespace quic
 
-#endif  // NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_CRYPTO_CLIENT_STREAM_H_
+#endif  // NET_QUIC_MOCK_CRYPTO_CLIENT_STREAM_H_

net/quic/mock_crypto_client_stream_factory.h

@@ -11,9 +11,9 @@
 #include "base/containers/queue.h"
 #include "base/macros.h"
 #include "net/quic/crypto/proof_verifier_chromium.h"
+#include "net/quic/mock_crypto_client_stream.h"
 #include "net/quic/quic_crypto_client_stream_factory.h"
 #include "net/third_party/quic/core/quic_server_id.h"
-#include "net/third_party/quic/test_tools/mock_crypto_client_stream.h"
 
 namespace quic {
 class QuicCryptoClientStream;

net/third_party/quic/test_tools/mock_decrypter.cc → net/quic/mock_decrypter.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/third_party/quic/test_tools/mock_decrypter.h"
+#include "net/quic/mock_decrypter.h"
 
 #include "net/third_party/quic/core/quic_utils.h"
 #include "net/third_party/quic/platform/api/quic_bug_tracker.h"

net/third_party/quic/test_tools/mock_decrypter.h → net/quic/mock_decrypter.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_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_DECRYPTER_H_
-#define NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_DECRYPTER_H_
+#ifndef NET_QUIC_MOCK_DECRYPTER_H_
+#define NET_QUIC_MOCK_DECRYPTER_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -52,4 +52,4 @@ class MockDecrypter : public QuicDecrypter {
 
 }  // namespace quic
 
-#endif  // NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_DECRYPTER_H_
+#endif  // NET_QUIC_MOCK_DECRYPTER_H_

net/third_party/quic/test_tools/mock_encrypter.cc → net/quic/mock_encrypter.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/third_party/quic/test_tools/mock_encrypter.h"
+#include "net/quic/mock_encrypter.h"
 
 #include "net/third_party/quic/core/quic_data_writer.h"
 #include "net/third_party/quic/core/quic_utils.h"

net/third_party/quic/test_tools/mock_encrypter.h → net/quic/mock_encrypter.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_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_ENCRYPTER_H_
-#define NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_ENCRYPTER_H_
+#ifndef NET_QUIC_MOCK_ENCRYPTER_H_
+#define NET_QUIC_MOCK_ENCRYPTER_H_
 
 #include <cstddef>
 
@@ -49,4 +49,4 @@ class MockEncrypter : public QuicEncrypter {
 
 }  // namespace quic
 
-#endif  // NET_THIRD_PARTY_QUIC_TEST_TOOLS_MOCK_ENCRYPTER_H_
+#endif  // NET_QUIC_MOCK_ENCRYPTER_H_

net/third_party/quic/platform/impl/quic_flags_impl.cc

@@ -5,5 +5,5 @@
 #include "net/third_party/quic/platform/impl/quic_flags_impl.h"
 
 #define QUIC_FLAG(type, flag, value) type flag = value;
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG

net/third_party/quic/platform/impl/quic_flags_impl.h

@@ -11,7 +11,7 @@
 #include "net/third_party/quic/platform/api/quic_export.h"
 
 #define QUIC_FLAG(type, flag, value) QUIC_EXPORT_PRIVATE extern type flag;
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG
 
 // API compatibility with new-style flags.

net/third_party/quic/platform/impl/quic_test_impl.cc

@@ -6,12 +6,12 @@
 
 QuicFlagSaverImpl::QuicFlagSaverImpl() {
 #define QUIC_FLAG(type, flag, value) saved_##flag##_ = flag;
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG
 }
 
 QuicFlagSaverImpl::~QuicFlagSaverImpl() {
 #define QUIC_FLAG(type, flag, value) flag = saved_##flag##_;
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG
 }

net/third_party/quic/platform/impl/quic_test_impl.h

@@ -20,7 +20,7 @@ class QuicFlagSaverImpl {
 
  private:
 #define QUIC_FLAG(type, flag, value) type saved_##flag##_;
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG
 };
 
@@ -33,7 +33,7 @@ class QuicFlagChecker {
       << "Flag set to an unexpected value.  A prior test is likely "      \
       << "setting a flag without using a QuicFlagSaver. Use QuicTest to " \
          "avoid this issue.";
-#include "net/third_party/quic/core/quic_flags_list.h"
+#include "net/quic/quic_flags_list.h"
 #undef QUIC_FLAG
   }
 };