diff options
| author | rdsmith <rdsmith@chromium.org> | 2015-03-11 16:16:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-11 23:16:24 +0000 |
| commit | 835930b518f8b17b015e488c2de169ac09caaaa4 (patch) | |
| tree | 7e483cc7f3b8528ccc995fd8c5a1b96812de5aef /net/sdch | |
| parent | 40e451af220ca80467fcc24c722f6bf8656d95ce (diff) | |
| download | chromium_src-835930b518f8b17b015e488c2de169ac09caaaa4.zip chromium_src-835930b518f8b17b015e488c2de169ac09caaaa4.tar.gz chromium_src-835930b518f8b17b015e488c2de169ac09caaaa4.tar.bz2 | |
Revert "[net]: Disable SdchOwner's MemoryPressureListener to investigate http://crbug.com/447208."
This reverts commit 9ead5677d87d725b68971f0464a423e7af22634c.
Conflicts:
net/sdch/sdch_owner.cc
BUG=447208
R=ellyjones@chromium.org
Review URL: https://codereview.chromium.org/997263002
Cr-Commit-Position: refs/heads/master@{#320180}
Diffstat (limited to 'net/sdch')
| -rw-r--r-- | net/sdch/sdch_owner.cc | 8 | ||||
| -rw-r--r-- | net/sdch/sdch_owner.h | 3 | ||||
| -rw-r--r-- | net/sdch/sdch_owner_unittest.cc | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/net/sdch/sdch_owner.cc b/net/sdch/sdch_owner.cc index a8348707..29f2d41 100644 --- a/net/sdch/sdch_owner.cc +++ b/net/sdch/sdch_owner.cc @@ -273,12 +273,16 @@ SdchOwner::SdchOwner(SdchManager* sdch_manager, URLRequestContext* context) clock_(new base::DefaultClock), max_total_dictionary_size_(kMaxTotalDictionarySize), min_space_for_dictionary_fetch_(kMinSpaceForDictionaryFetch), - // TODO(rmcilroy) Add back memory_pressure_listener_ when - // http://crbug.com/447208 is fixed #if defined(OS_CHROMEOS) // For debugging http://crbug.com/454198; remove when resolved. destroyed_(0), #endif + 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))), in_memory_pref_store_(new ValueMapPrefStore()), external_pref_store_(nullptr), pref_store_(in_memory_pref_store_.get()) { diff --git a/net/sdch/sdch_owner.h b/net/sdch/sdch_owner.h index 134bb86..1655275 100644 --- a/net/sdch/sdch_owner.h +++ b/net/sdch/sdch_owner.h @@ -132,8 +132,7 @@ class NET_EXPORT SdchOwner : public net::SdchObserver, unsigned int destroyed_; #endif - // TODO(rmcilroy) Add back memory_pressure_listener_ when - // http://crbug.com/447208 is fixed + base::MemoryPressureListener memory_pressure_listener_; // Dictionary persistence machinery. // * |in_memory_pref_store_| is created on construction and used in diff --git a/net/sdch/sdch_owner_unittest.cc b/net/sdch/sdch_owner_unittest.cc index 73965dc..bbaceed 100644 --- a/net/sdch/sdch_owner_unittest.cc +++ b/net/sdch/sdch_owner_unittest.cc @@ -594,9 +594,7 @@ TEST_F(SdchOwnerTest, ClearReturnsSpace) { } // Confirm memory pressure gets all the space back. -// TODO(rmcilroy) Disabled while investigating http://crbug.com/447208 - -// re-enable once fixed. -TEST_F(SdchOwnerTest, DISABLED_MemoryPressureReturnsSpace) { +TEST_F(SdchOwnerTest, MemoryPressureReturnsSpace) { std::string server_hash_d1; std::string server_hash_d2; |