summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 07:20:29 +0000
committerernstm@chromium.org <ernstm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 07:20:29 +0000
commit93eb532ae950220fd8e4e7ed1a623b4cfc1efc10 (patch)
tree303d827d1a170fb089f2cb2a61d6a7005d2ab7c6 /base
parent30d17f2fbbbc06f459886c5d06767309ae3ca863 (diff)
downloadchromium_src-93eb532ae950220fd8e4e7ed1a623b4cfc1efc10.zip
chromium_src-93eb532ae950220fd8e4e7ed1a623b4cfc1efc10.tar.gz
chromium_src-93eb532ae950220fd8e4e7ed1a623b4cfc1efc10.tar.bz2
Ingnore unsupported arguments in TraceEventAnalyzer.
Trace events now carry Dictionary arguments (https://codereview.chromium.org/23088002/), which cause TraceEventAnalyzer to fail hard. Changing the behavior to issue a warning instead and ignore the unsupported arguments. R=phajdan.jr@chromium.org BUG=266101, 264308 Review URL: https://chromiumcodereview.appspot.com/23189006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/test/trace_event_analyzer.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index 94d49a4..adefe0a 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -94,9 +94,9 @@ bool TraceEvent::SetFromJSON(const base::Value* event_value) {
else if (it.value().GetAsDouble(&double_num))
arg_numbers[it.key()] = double_num;
else {
- LOG(ERROR) << "Value type of argument is not supported: " <<
+ LOG(WARNING) << "Value type of argument is not supported: " <<
static_cast<int>(it.value().GetType());
- return false; // Invalid trace event JSON format.
+ continue; // Skip non-supported arguments.
}
}