diff options
| author | mef <mef@chromium.org> | 2015-12-30 15:41:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-30 23:42:55 +0000 |
| commit | e666e9a71d427a7c3efdc39b1aed8ea5cba844d4 (patch) | |
| tree | a4e899465c03ceaac1888470b6e957fea46266b2 | |
| parent | ef5777214152eb0bf020be5074e524a8580aa302 (diff) | |
| download | chromium_src-e666e9a71d427a7c3efdc39b1aed8ea5cba844d4.zip chromium_src-e666e9a71d427a7c3efdc39b1aed8ea5cba844d4.tar.gz chromium_src-e666e9a71d427a7c3efdc39b1aed8ea5cba844d4.tar.bz2 | |
Fix net_unittests build errors when enable_bidirectional_stream is set.
1. Use int instead of int64.
2. Define ENABLE_BIDIRECTIONAL_STREAM on net_unittests target.
BUG=516342
Review URL: https://codereview.chromium.org/1557643002
Cr-Commit-Position: refs/heads/master@{#367205}
| -rw-r--r-- | net/net.gyp | 6 | ||||
| -rw-r--r-- | net/spdy/bidirectional_stream_spdy_job.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/net.gyp b/net/net.gyp index c11f60f..98bb5c0 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -289,7 +289,11 @@ 'sources!': [ 'http/bidirectional_stream_unittest.cc', ], - }, + }, { # else + 'defines': [ + 'ENABLE_BIDIRECTIONAL_STREAM', + ], + } ], [ 'enable_built_in_dns!=1', { 'sources!': [ diff --git a/net/spdy/bidirectional_stream_spdy_job.cc b/net/spdy/bidirectional_stream_spdy_job.cc index 086d1b2..553d191 100644 --- a/net/spdy/bidirectional_stream_spdy_job.cc +++ b/net/spdy/bidirectional_stream_spdy_job.cc @@ -22,7 +22,7 @@ namespace { // Time to wait in millisecond to notify |delegate_| of data received. // Handing small chunks of data to the caller creates measurable overhead. // So buffer data in short time-spans and send a single read notification. -const int64 kBufferTimeMs = 1; +const int kBufferTimeMs = 1; } // namespace |