Update from https://crrev.com/304418

net/net.gypi

Index: net/net.gypi
diff --git a/net/net.gypi b/net/net.gypi
index fef61361dd5cf3c083a0b63a72ba4071488b769e..337f016567ff618950f9be4cc7cb92deeb932a7f 100644
--- a/net/net.gypi
+++ b/net/net.gypi
@@ -246,7 +246,11 @@
       'base/net_log_logger.h',
       'base/net_log_util.cc',
       'base/net_log_util.h',
+      'base/net_util_linux.cc',
+      'base/net_util_mac.cc',
       'base/net_util_win.cc',
+      'base/network_activity_monitor.cc',
+      'base/network_activity_monitor.h',
       'base/network_change_notifier.cc',
       'base/network_change_notifier.h',
       'base/network_change_notifier_factory.h',
@@ -275,8 +279,12 @@
       'base/request_priority.h',
       'base/sdch_manager.cc',
       'base/sdch_manager.h',
+      'base/sdch_net_log_params.cc',
+      'base/sdch_net_log_params.h',
       'base/sdch_observer.cc',
       'base/sdch_observer.h',
+      'base/sdch_problem_code_list.h',
+      'base/sdch_problem_codes.h',
       'base/static_cookie_policy.cc',
       'base/static_cookie_policy.h',
       'base/test_data_stream.cc',
@@ -751,8 +759,6 @@
       'quic/congestion_control/cubic.h',
       'quic/congestion_control/hybrid_slow_start.cc',
       'quic/congestion_control/hybrid_slow_start.h',
-      'quic/congestion_control/leaky_bucket.cc',
-      'quic/congestion_control/leaky_bucket.h',
       'quic/congestion_control/loss_detection_interface.cc',
       'quic/congestion_control/loss_detection_interface.h',
       'quic/congestion_control/pacing_sender.cc',
@@ -785,6 +791,8 @@
       'quic/crypto/aes_128_gcm_12_encrypter.h',
       'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
       'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
+      'quic/crypto/cached_network_parameters.cc',
+      'quic/crypto/cached_network_parameters.h',
       'quic/crypto/cert_compressor.cc',
       'quic/crypto/cert_compressor.h',
       'quic/crypto/chacha20_poly1305_decrypter.h',
@@ -1276,6 +1284,7 @@
       'base/net_log_util_unittest.cc',
       'base/net_util_unittest.cc',
       'base/net_util_icu_unittest.cc',
+      'base/network_activity_monitor_unittest.cc',
       'base/network_change_notifier_unittest.cc',
       'base/network_change_notifier_win_unittest.cc',
       'base/prioritized_dispatcher_unittest.cc',
@@ -1440,7 +1449,6 @@
       'quic/congestion_control/cube_root_test.cc',
       'quic/congestion_control/cubic_test.cc',
       'quic/congestion_control/hybrid_slow_start_test.cc',
-      'quic/congestion_control/leaky_bucket_test.cc',
       'quic/congestion_control/pacing_sender_test.cc',
       'quic/congestion_control/prr_sender_test.cc',
       'quic/congestion_control/rtt_stats_test.cc',