Commit 9ead5677 authored by rmcilroy's avatar rmcilroy Committed by Commit bot

[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}
parent 7c7296f4
......@@ -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());
......
......@@ -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);
};
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment