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/filter | |
| 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/filter')
| -rw-r--r-- | chromium/net/filter/filter.cc | 3 | ||||
| -rw-r--r-- | chromium/net/filter/sdch_filter_unittest.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/net/filter/filter.cc b/chromium/net/filter/filter.cc index 708ad814eea..f9c3712cf4a 100644 --- a/chromium/net/filter/filter.cc +++ b/chromium/net/filter/filter.cc @@ -379,8 +379,7 @@ Filter* Filter::PrependNewFilter(FilterType type_id, break; case FILTER_TYPE_SDCH: case FILTER_TYPE_SDCH_POSSIBLE: - if (filter_context.GetURLRequestContext()->sdch_manager() && - SdchManager::sdch_enabled()) { + if (filter_context.GetURLRequestContext()->sdch_manager()) { first_filter.reset( InitSdchFilter(type_id, filter_context, buffer_size)); } diff --git a/chromium/net/filter/sdch_filter_unittest.cc b/chromium/net/filter/sdch_filter_unittest.cc index a83e63ff4c9..35276cb764a 100644 --- a/chromium/net/filter/sdch_filter_unittest.cc +++ b/chromium/net/filter/sdch_filter_unittest.cc @@ -85,7 +85,7 @@ class SdchFilterTest : public testing::Test { sdch_manager_->GetDictionarySet(url).Pass()); } - std::string NewSdchCompressedData(const std::string dictionary) { + std::string NewSdchCompressedData(const std::string& dictionary) { std::string client_hash; std::string server_hash; SdchManager::GenerateHash(dictionary, &client_hash, &server_hash); |