Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: base/debug/trace_event_unittest.cc

Issue 7840017: Fix trace_event code to accept double-quote and backslash characters in string values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/debug/trace_event.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 void TraceWithAllMacroVariants(WaitableEvent* task_complete_event) { 199 void TraceWithAllMacroVariants(WaitableEvent* task_complete_event) {
200 { 200 {
201 TRACE_EVENT_BEGIN_ETW("TRACE_EVENT_BEGIN_ETW call", 1122, "extrastring1"); 201 TRACE_EVENT_BEGIN_ETW("TRACE_EVENT_BEGIN_ETW call", 1122, "extrastring1");
202 TRACE_EVENT_END_ETW("TRACE_EVENT_END_ETW call", 3344, "extrastring2"); 202 TRACE_EVENT_END_ETW("TRACE_EVENT_END_ETW call", 3344, "extrastring2");
203 TRACE_EVENT_INSTANT_ETW("TRACE_EVENT_INSTANT_ETW call", 203 TRACE_EVENT_INSTANT_ETW("TRACE_EVENT_INSTANT_ETW call",
204 5566, "extrastring3"); 204 5566, "extrastring3");
205 205
206 TRACE_EVENT0("all", "TRACE_EVENT0 call"); 206 TRACE_EVENT0("all", "TRACE_EVENT0 call");
207 TRACE_EVENT1("all", "TRACE_EVENT1 call", "name1", "value1"); 207 TRACE_EVENT1("all", "TRACE_EVENT1 call", "name1", "value1");
208 TRACE_EVENT2("all", "TRACE_EVENT2 call", 208 TRACE_EVENT2("all", "TRACE_EVENT2 call",
209 "name1", "value1", 209 "name1", "\"value1\"",
210 "name2", "value2"); 210 "name2", "value\\2");
211 211
212 TRACE_EVENT_INSTANT0("all", "TRACE_EVENT_INSTANT0 call"); 212 TRACE_EVENT_INSTANT0("all", "TRACE_EVENT_INSTANT0 call");
213 TRACE_EVENT_INSTANT1("all", "TRACE_EVENT_INSTANT1 call", "name1", "value1"); 213 TRACE_EVENT_INSTANT1("all", "TRACE_EVENT_INSTANT1 call", "name1", "value1");
214 TRACE_EVENT_INSTANT2("all", "TRACE_EVENT_INSTANT2 call", 214 TRACE_EVENT_INSTANT2("all", "TRACE_EVENT_INSTANT2 call",
215 "name1", "value1", 215 "name1", "value1",
216 "name2", "value2"); 216 "name2", "value2");
217 217
218 TRACE_EVENT_BEGIN0("all", "TRACE_EVENT_BEGIN0 call"); 218 TRACE_EVENT_BEGIN0("all", "TRACE_EVENT_BEGIN0 call");
219 TRACE_EVENT_BEGIN1("all", "TRACE_EVENT_BEGIN1 call", "name1", "value1"); 219 TRACE_EVENT_BEGIN1("all", "TRACE_EVENT_BEGIN1 call", "name1", "value1");
220 TRACE_EVENT_BEGIN2("all", "TRACE_EVENT_BEGIN2 call", 220 TRACE_EVENT_BEGIN2("all", "TRACE_EVENT_BEGIN2 call",
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 EXPECT_TRUE((item && item->GetString("ph", &ph_begin))); 262 EXPECT_TRUE((item && item->GetString("ph", &ph_begin)));
263 EXPECT_TRUE((item = FindTraceEntry(trace_parsed, "TRACE_EVENT0 call", 263 EXPECT_TRUE((item = FindTraceEntry(trace_parsed, "TRACE_EVENT0 call",
264 item))); 264 item)));
265 EXPECT_TRUE((item && item->GetString("ph", &ph_end))); 265 EXPECT_TRUE((item && item->GetString("ph", &ph_end)));
266 EXPECT_EQ("B", ph_begin); 266 EXPECT_EQ("B", ph_begin);
267 EXPECT_EQ("E", ph_end); 267 EXPECT_EQ("E", ph_end);
268 } 268 }
269 EXPECT_FIND_("TRACE_EVENT1 call"); 269 EXPECT_FIND_("TRACE_EVENT1 call");
270 EXPECT_FIND_("TRACE_EVENT2 call"); 270 EXPECT_FIND_("TRACE_EVENT2 call");
271 EXPECT_SUB_FIND_("name1"); 271 EXPECT_SUB_FIND_("name1");
272 EXPECT_SUB_FIND_("value1"); 272 EXPECT_SUB_FIND_("\"value1\"");
273 EXPECT_SUB_FIND_("name2"); 273 EXPECT_SUB_FIND_("name2");
274 EXPECT_SUB_FIND_("value2"); 274 EXPECT_SUB_FIND_("value\\2");
275 EXPECT_FIND_("TRACE_EVENT_INSTANT0 call"); 275 EXPECT_FIND_("TRACE_EVENT_INSTANT0 call");
276 EXPECT_FIND_("TRACE_EVENT_INSTANT1 call"); 276 EXPECT_FIND_("TRACE_EVENT_INSTANT1 call");
277 EXPECT_FIND_("TRACE_EVENT_INSTANT2 call"); 277 EXPECT_FIND_("TRACE_EVENT_INSTANT2 call");
278 EXPECT_SUB_FIND_("name1"); 278 EXPECT_SUB_FIND_("name1");
279 EXPECT_SUB_FIND_("value1"); 279 EXPECT_SUB_FIND_("value1");
280 EXPECT_SUB_FIND_("name2"); 280 EXPECT_SUB_FIND_("name2");
281 EXPECT_SUB_FIND_("value2"); 281 EXPECT_SUB_FIND_("value2");
282 EXPECT_FIND_("TRACE_EVENT_BEGIN0 call"); 282 EXPECT_FIND_("TRACE_EVENT_BEGIN0 call");
283 EXPECT_FIND_("TRACE_EVENT_BEGIN1 call"); 283 EXPECT_FIND_("TRACE_EVENT_BEGIN1 call");
284 EXPECT_FIND_("TRACE_EVENT_BEGIN2 call"); 284 EXPECT_FIND_("TRACE_EVENT_BEGIN2 call");
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 764
765 std::string s; 765 std::string s;
766 EXPECT_TRUE(entry3->GetString("args.arg1", &s)); 766 EXPECT_TRUE(entry3->GetString("args.arg1", &s));
767 EXPECT_EQ("val1", s); 767 EXPECT_EQ("val1", s);
768 EXPECT_TRUE(entry3->GetString("args.arg2", &s)); 768 EXPECT_TRUE(entry3->GetString("args.arg2", &s));
769 EXPECT_EQ("val2", s); 769 EXPECT_EQ("val2", s);
770 } 770 }
771 771
772 } // namespace debug 772 } // namespace debug
773 } // namespace base 773 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/trace_event.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698