diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 07:22:41 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-03 07:22:41 +0000 |
| commit | 5351cc4b92a85cd508cf6944386141945a913f5e (patch) | |
| tree | 4f91215a3fb703da4e17f3663f430d02d8f65592 /net/net.gyp | |
| parent | 20ba262d5122abe134b6e78ddb574c1a419505ab (diff) | |
| download | chromium_src-5351cc4b92a85cd508cf6944386141945a913f5e.zip chromium_src-5351cc4b92a85cd508cf6944386141945a913f5e.tar.gz chromium_src-5351cc4b92a85cd508cf6944386141945a913f5e.tar.bz2 | |
Land Recent QUIC Changes
Fix a merging error in the previous checkin.
visitor_ is now a scoped_ptr so the visitor_(NULL) initializer
was removed.
Merge internal change: 43199271
More cleanups that fell out of recent Chrome merges.
Merge internal change: 43195667
Implement framing for version flag and field.
Merge internal change: 43155434
Reduce the usage of magic numbers by moving most of them to quic_protocol.h
Merge internal change: 43133922
Expose functions to calculate offsets and packet sizes from quic_protocol.h.
Merge internal change: 43123088
Various cleanups from landing recent changes in Chrome.
Merge internal change: 43060871
Moving the quic session's write blocked list over such that we won't add a given session multiple times.
Merge internal change: 42920586
Factoring our blocked list out into a separate class.
Merge internal change: 42919835
R=jar@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12374030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 8777fc2..12e618a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -673,6 +673,7 @@ 'proxy/proxy_server_mac.cc', 'proxy/proxy_service.cc', 'proxy/proxy_service.h', + 'quic/blocked_list.h', 'quic/congestion_control/cubic.cc', 'quic/congestion_control/cubic.h', 'quic/congestion_control/fix_rate_receiver.cc', @@ -1521,6 +1522,7 @@ 'proxy/proxy_script_fetcher_impl_unittest.cc', 'proxy/proxy_server_unittest.cc', 'proxy/proxy_service_unittest.cc', + 'quic/blocked_list_test.cc', 'quic/congestion_control/cubic_test.cc', 'quic/congestion_control/fix_rate_test.cc', 'quic/congestion_control/hybrid_slow_start_test.cc', |