base/test/trace_event_analyzer.cc - Issue 1180693002: Update from https://crrev.com/333737

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/test/trace_event_analyzer.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/test/trace_event_analyzer.cc

diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc

index 3de58e7a61be58f89b063436267e2f27629bf835..e46c2a517071025f18a5d21313bc38dc4f65b95c 100644

--- a/base/test/trace_event_analyzer.cc

+++ b/base/test/trace_event_analyzer.cc

@@ -648,7 +648,7 @@ size_t FindMatchingEvents(const std::vector<TraceEvent>& events,

bool ParseEventsFromJson(const std::string& json,

std::vector<TraceEvent>* output) {

scoped_ptr<base::Value> root;

- root.reset(base::JSONReader::Read(json));

+ root.reset(base::JSONReader::DeprecatedRead(json));

base::ListValue* root_list = NULL;

if (!root.get() || !root->GetAsList(&root_list))

« no previous file with comments | « base/test/test_ui_thread_android.cc ('k') | base/test/trace_event_analyzer_unittest.cc » ('j') | no next file with comments »