Index: net/sdch/sdch_owner.cc |
diff --git a/net/sdch/sdch_owner.cc b/net/sdch/sdch_owner.cc |
index 7426c943208a755bb1e2ab42cf2f230788a071a0..945bc554d335f9a7979df3e39d78a55263f5b328 100644 |
--- a/net/sdch/sdch_owner.cc |
+++ b/net/sdch/sdch_owner.cc |
@@ -87,18 +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), |
-#if defined(OS_CHROMEOS) |
+ min_space_for_dictionary_fetch_(kMinSpaceForDictionaryFetch) |
+ // TODO(rmcilroy) Add back memory_pressure_listener_ when |
+ // http://crbug.com/447208 is fixed |
+#if !defined(OS_CHROMEOS) |
+ { |
+#else |
// 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))) { |
-#if defined(OS_CHROMEOS) |
+ , destroyed_(0) { |
// For debugging http://crbug.com/454198; remove when resolved. |
CHECK(clock_.get()); |
#endif |
davidben
2015/02/28 00:18:18
Nit: the ifdef'ing might be less scary if you do..
rmcilroy
2015/02/28 00:33:09
Done.
|