Landing Recent QUIC changes until Mon Apr 17 2017

net/BUILD.gn

Index: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 28477ee62f3afd246bdc466f4ea4346495454ef6..1c06639bc61288c5d37bbef4f5068f95ccb105bc 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1267,8 +1267,6 @@ component("net") {
       "quic/core/quic_data_writer.h",
       "quic/core/quic_error_codes.cc",
       "quic/core/quic_error_codes.h",
-      "quic/core/quic_flags.cc",
-      "quic/core/quic_flags.h",
       "quic/core/quic_flags_list.h",
       "quic/core/quic_flow_controller.cc",
       "quic/core/quic_flow_controller.h",
@@ -1343,6 +1341,7 @@ component("net") {
       "quic/platform/api/quic_estimate_memory_usage.h",
       "quic/platform/api/quic_export.h",
       "quic/platform/api/quic_flag_utils.h",
+      "quic/platform/api/quic_flags.h",
       "quic/platform/api/quic_hostname_utils.cc",
       "quic/platform/api/quic_hostname_utils.h",
       "quic/platform/api/quic_ip_address.cc",
@@ -1374,6 +1373,8 @@ component("net") {
       "quic/platform/impl/quic_estimate_memory_usage_impl.h",
       "quic/platform/impl/quic_export_impl.h",
       "quic/platform/impl/quic_flag_utils_impl.h",
+      "quic/platform/impl/quic_flags_impl.cc",
+      "quic/platform/impl/quic_flags_impl.h",
       "quic/platform/impl/quic_hostname_utils_impl.cc",
       "quic/platform/impl/quic_hostname_utils_impl.h",
       "quic/platform/impl/quic_ip_address_impl.cc",