diff options
| author | Ross McIlroy <rmcilroy@chromium.org> | 2015-03-02 15:00:48 +0000 |
|---|---|---|
| committer | Ross McIlroy <rmcilroy@chromium.org> | 2015-03-02 15:03:37 +0000 |
| commit | e9640b6d3e30f9b67949b8b9d067e4265208f130 (patch) | |
| tree | 1a8a3e4d533f9529853c009c35d86ef95dda200c | |
| parent | dfef7ff27a1bad6ca64f54aae2770208ba137db7 (diff) | |
| download | chromium_src-e9640b6d3e30f9b67949b8b9d067e4265208f130.zip chromium_src-e9640b6d3e30f9b67949b8b9d067e4265208f130.tar.gz chromium_src-e9640b6d3e30f9b67949b8b9d067e4265208f130.tar.bz2 | |
[net]: Disable SdchOwner's MemoryPressureListener to investigate http://crbug.com/447208.
BUG=447208
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/962313003
Also Reverts:
Double size of Android and iOS memory dedicated to SDCH dictionaries.
Review URL: https://codereview.chromium.org/840683003
Cr-Commit-Position: refs/heads/master@{#318575}
(cherry picked from commit 9ead5677d87d725b68971f0464a423e7af22634c)
R=rdsmith@chromium.org
Review URL: https://codereview.chromium.org/968873002
Cr-Commit-Position: refs/branch-heads/2272@{#393}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
| -rw-r--r-- | net/sdch/sdch_owner.cc | 12 | ||||
| -rw-r--r-- | net/sdch/sdch_owner.h | 3 | ||||
| -rw-r--r-- | net/sdch/sdch_owner_unittest.cc | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/net/sdch/sdch_owner.cc b/net/sdch/sdch_owner.cc index b0e4405..09543dc 100644 --- a/net/sdch/sdch_owner.cc +++ b/net/sdch/sdch_owner.cc @@ -61,7 +61,7 @@ namespace net { // Adjust SDCH limits downwards for mobile. #if defined(OS_ANDROID) || defined(OS_IOS) // static -const size_t SdchOwner::kMaxTotalDictionarySize = 1000 * 1000; +const size_t SdchOwner::kMaxTotalDictionarySize = 500 * 1000; #else // static const size_t SdchOwner::kMaxTotalDictionarySize = 20 * 1000 * 1000; @@ -85,13 +85,9 @@ SdchOwner::SdchOwner(net::SdchManager* sdch_manager, total_dictionary_bytes_(0), clock_(new base::DefaultClock), max_total_dictionary_size_(kMaxTotalDictionarySize), - min_space_for_dictionary_fetch_(kMinSpaceForDictionaryFetch), - memory_pressure_listener_( - base::Bind(&SdchOwner::OnMemoryPressure, - // Because |memory_pressure_listener_| is owned by - // SdchOwner, the SdchOwner object will be available - // for the lifetime of |memory_pressure_listener_|. - base::Unretained(this))) { + min_space_for_dictionary_fetch_(kMinSpaceForDictionaryFetch) { + // TODO(rmcilroy) Add back memory_pressure_listener_ when + // http://crbug.com/447208 is fixed manager_->AddObserver(this); } diff --git a/net/sdch/sdch_owner.h b/net/sdch/sdch_owner.h index 9620326..8233adc 100644 --- a/net/sdch/sdch_owner.h +++ b/net/sdch/sdch_owner.h @@ -87,7 +87,8 @@ class NET_EXPORT SdchOwner : public net::SdchObserver { size_t max_total_dictionary_size_; size_t min_space_for_dictionary_fetch_; - base::MemoryPressureListener memory_pressure_listener_; + // TODO(rmcilroy) Add back memory_pressure_listener_ when + // http://crbug.com/447208 is fixed DISALLOW_COPY_AND_ASSIGN(SdchOwner); }; diff --git a/net/sdch/sdch_owner_unittest.cc b/net/sdch/sdch_owner_unittest.cc index e89533a..2d1cd13 100644 --- a/net/sdch/sdch_owner_unittest.cc +++ b/net/sdch/sdch_owner_unittest.cc @@ -461,7 +461,9 @@ TEST_F(SdchOwnerTest, ClearReturnsSpace) { } // Confirm memory pressure gets all the space back. -TEST_F(SdchOwnerTest, MemoryPressureReturnsSpace) { +// TODO(rmcilroy) Disabled while investigating http://crbug.com/447208 - +// re-enable once fixed. +TEST_F(SdchOwnerTest, DISABLED_MemoryPressureReturnsSpace) { std::string server_hash_d1; std::string server_hash_d2; |