diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/net/tools/quic/quic_in_memory_cache.cc | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/net/tools/quic/quic_in_memory_cache.cc')
| -rw-r--r-- | chromium/net/tools/quic/quic_in_memory_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/tools/quic/quic_in_memory_cache.cc b/chromium/net/tools/quic/quic_in_memory_cache.cc index d611c31c0ba..2ae5c49d9e8 100644 --- a/chromium/net/tools/quic/quic_in_memory_cache.cc +++ b/chromium/net/tools/quic/quic_in_memory_cache.cc @@ -27,7 +27,7 @@ QuicInMemoryCache::Response::~Response() {} // static QuicInMemoryCache* QuicInMemoryCache::GetInstance() { - return Singleton<QuicInMemoryCache>::get(); + return base::Singleton<QuicInMemoryCache>::get(); } const QuicInMemoryCache::Response* QuicInMemoryCache::GetResponse( @@ -154,7 +154,7 @@ void QuicInMemoryCache::InitializeFromDirectory(const string& cache_directory) { // format to store response. Once SPDY/3 responses are no longer // required, the cache can store SPDY/4 headers. SpdyHeaderBlock header_block; - CreateSpdyHeadersFromHttpResponse(*response_headers, SPDY3, &header_block); + CreateSpdyHeadersFromHttpResponse(*response_headers, HTTP2, &header_block); AddResponse(host, path, header_block, body); } } |