diff options
| author | rmcilroy <rmcilroy@chromium.org> | 2015-02-27 18:24:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-28 02:25:13 +0000 |
| commit | 9ead5677d87d725b68971f0464a423e7af22634c (patch) | |
| tree | 593c3837f55cb3ec95129432c187ba168d279dda /net/sdch | |
| parent | 7c7296f4dcb7e32fa4440b333a40a37699f517b1 (diff) | |
| download | chromium_src-9ead5677d87d725b68971f0464a423e7af22634c.zip chromium_src-9ead5677d87d725b68971f0464a423e7af22634c.tar.gz chromium_src-9ead5677d87d725b68971f0464a423e7af22634c.tar.bz2 | |
[net]: Disable SdchOwner's MemoryPressureListener to investigate http://crbug.com/447208.
BUG=447208
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/962313003
Cr-Commit-Position: refs/heads/master@{#318575}
Diffstat (limited to 'net/sdch')
| -rw-r--r-- | net/sdch/sdch_owner.cc | 13 | ||||
| -rw-r--r-- | net/sdch/sdch_owner.h | 3 | ||||
| -rw-r--r-- | net/sdch/sdch_owner_unittest.cc | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net/sdch/sdch_owner.cc b/net/sdch/sdch_owner.cc index 7426c94..4e3eef0 100644 --- a/net/sdch/sdch_owner.cc +++ b/net/sdch/sdch_owner.cc @@ -87,17 +87,14 @@ 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), + 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), + , 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))) { + { #if defined(OS_CHROMEOS) // For debugging http://crbug.com/454198; remove when resolved. CHECK(clock_.get()); diff --git a/net/sdch/sdch_owner.h b/net/sdch/sdch_owner.h index 93ef972..e75c780 100644 --- a/net/sdch/sdch_owner.h +++ b/net/sdch/sdch_owner.h @@ -92,7 +92,8 @@ class NET_EXPORT SdchOwner : public net::SdchObserver { unsigned int destroyed_; #endif - 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; |