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/sdch_owner.h | |
| 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/sdch_owner.h')
| -rw-r--r-- | net/sdch/sdch_owner.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 |