1*635a8641SAndroid Build Coastguard Worker# we don't support trace_event on libchrome 2*635a8641SAndroid Build Coastguard Worker 3*635a8641SAndroid Build Coastguard Worker--- a/base/values.cc 4*635a8641SAndroid Build Coastguard Worker+++ b/base/values.cc 5*635a8641SAndroid Build Coastguard Worker@@ -18,7 +18,8 @@ 6*635a8641SAndroid Build Coastguard Worker #include "base/stl_util.h" 7*635a8641SAndroid Build Coastguard Worker #include "base/strings/string_util.h" 8*635a8641SAndroid Build Coastguard Worker #include "base/strings/utf_string_conversions.h" 9*635a8641SAndroid Build Coastguard Worker-#include "base/trace_event/memory_usage_estimator.h" 10*635a8641SAndroid Build Coastguard Worker+// Unsupported in libchrome 11*635a8641SAndroid Build Coastguard Worker+// #include "base/trace_event/memory_usage_estimator.h" 12*635a8641SAndroid Build Coastguard Worker 13*635a8641SAndroid Build Coastguard Worker namespace base { 14*635a8641SAndroid Build Coastguard Worker 15*635a8641SAndroid Build Coastguard Worker@@ -632,20 +633,21 @@ bool Value::Equals(const Value* other) const { 16*635a8641SAndroid Build Coastguard Worker return *this == *other; 17*635a8641SAndroid Build Coastguard Worker } 18*635a8641SAndroid Build Coastguard Worker 19*635a8641SAndroid Build Coastguard Worker-size_t Value::EstimateMemoryUsage() const { 20*635a8641SAndroid Build Coastguard Worker- switch (type_) { 21*635a8641SAndroid Build Coastguard Worker- case Type::STRING: 22*635a8641SAndroid Build Coastguard Worker- return base::trace_event::EstimateMemoryUsage(string_value_); 23*635a8641SAndroid Build Coastguard Worker- case Type::BINARY: 24*635a8641SAndroid Build Coastguard Worker- return base::trace_event::EstimateMemoryUsage(binary_value_); 25*635a8641SAndroid Build Coastguard Worker- case Type::DICTIONARY: 26*635a8641SAndroid Build Coastguard Worker- return base::trace_event::EstimateMemoryUsage(dict_); 27*635a8641SAndroid Build Coastguard Worker- case Type::LIST: 28*635a8641SAndroid Build Coastguard Worker- return base::trace_event::EstimateMemoryUsage(list_); 29*635a8641SAndroid Build Coastguard Worker- default: 30*635a8641SAndroid Build Coastguard Worker- return 0; 31*635a8641SAndroid Build Coastguard Worker- } 32*635a8641SAndroid Build Coastguard Worker-} 33*635a8641SAndroid Build Coastguard Worker+// Unsupported in libchrome 34*635a8641SAndroid Build Coastguard Worker+// size_t Value::EstimateMemoryUsage() const { 35*635a8641SAndroid Build Coastguard Worker+// switch (type_) { 36*635a8641SAndroid Build Coastguard Worker+// case Type::STRING: 37*635a8641SAndroid Build Coastguard Worker+// return base::trace_event::EstimateMemoryUsage(string_value_); 38*635a8641SAndroid Build Coastguard Worker+// case Type::BINARY: 39*635a8641SAndroid Build Coastguard Worker+// return base::trace_event::EstimateMemoryUsage(binary_value_); 40*635a8641SAndroid Build Coastguard Worker+// case Type::DICTIONARY: 41*635a8641SAndroid Build Coastguard Worker+// return base::trace_event::EstimateMemoryUsage(dict_); 42*635a8641SAndroid Build Coastguard Worker+// case Type::LIST: 43*635a8641SAndroid Build Coastguard Worker+// return base::trace_event::EstimateMemoryUsage(list_); 44*635a8641SAndroid Build Coastguard Worker+// default: 45*635a8641SAndroid Build Coastguard Worker+// return 0; 46*635a8641SAndroid Build Coastguard Worker+// } 47*635a8641SAndroid Build Coastguard Worker+// } 48*635a8641SAndroid Build Coastguard Worker 49*635a8641SAndroid Build Coastguard Worker void Value::InternalMoveConstructFrom(Value&& that) { 50*635a8641SAndroid Build Coastguard Worker type_ = that.type_; 51*635a8641SAndroid Build Coastguard Worker 52*635a8641SAndroid Build Coastguard Worker--- a/base/values.h 53*635a8641SAndroid Build Coastguard Worker+++ b/base/values.h 54*635a8641SAndroid Build Coastguard Worker@@ -352,7 +352,7 @@ class BASE_EXPORT Value { 55*635a8641SAndroid Build Coastguard Worker 56*635a8641SAndroid Build Coastguard Worker // Estimates dynamic memory usage. 57*635a8641SAndroid Build Coastguard Worker // See base/trace_event/memory_usage_estimator.h for more info. 58*635a8641SAndroid Build Coastguard Worker- size_t EstimateMemoryUsage() const; 59*635a8641SAndroid Build Coastguard Worker+ // size_t EstimateMemoryUsage() const; 60*635a8641SAndroid Build Coastguard Worker 61*635a8641SAndroid Build Coastguard Worker protected: 62*635a8641SAndroid Build Coastguard Worker // TODO(crbug.com/646113): Make these private once DictionaryValue and 63*635a8641SAndroid Build Coastguard Worker 64