Index: content/browser/devtools/protocol/tracing_handler_unittest.cc |
diff --git a/content/browser/devtools/protocol/tracing_handler_unittest.cc b/content/browser/devtools/protocol/tracing_handler_unittest.cc |
index 8ca2dee070b027c045b98e4f42f2e2729ce5e570..aa10c4e9a8920f2a36b1944ac6475205257646a1 100644 |
--- a/content/browser/devtools/protocol/tracing_handler_unittest.cc |
+++ b/content/browser/devtools/protocol/tracing_handler_unittest.cc |
@@ -14,44 +14,60 @@ namespace protocol { |
namespace { |
const char kCustomTraceConfigString[] = |
- "{" |
+ "{" |
"\"enable_argument_filter\":true," |
"\"enable_systrace\":true," |
"\"excluded_categories\":[\"excluded\",\"exc_pattern*\"]," |
"\"included_categories\":[\"included\"," |
- "\"inc_pattern*\"," |
- "\"disabled-by-default-cc\"," |
- "\"disabled-by-default-memory-infra\"]," |
+ "\"inc_pattern*\"," |
+ "\"disabled-by-default-cc\"," |
+ "\"disabled-by-default-memory-infra\"]," |
"\"memory_dump_config\":{" |
- "\"allowed_dump_modes\":[\"background\",\"light\",\"detailed\"]," |
- "\"triggers\":[" |
- "{\"mode\":\"light\",\"periodic_interval_ms\":50}," |
- "{\"mode\":\"detailed\",\"periodic_interval_ms\":1000}" |
- "]" |
+ "\"allowed_dump_modes\":[\"background\",\"light\",\"detailed\"]," |
+ "\"triggers\":[" |
+ "{" |
+ "\"min_time_between_dumps_ms\":50," |
+ "\"mode\":\"light\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}," |
+ "{" |
+ "\"min_time_between_dumps_ms\":1000," |
+ "\"mode\":\"detailed\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}" |
+ "]" |
"}," |
"\"record_mode\":\"record-continuously\"," |
"\"synthetic_delays\":[\"test.Delay1;16\",\"test.Delay2;32\"]" |
- "}"; |
+ "}"; |
const char kCustomTraceConfigStringDevToolsStyle[] = |
- "{" |
+ "{" |
"\"enableArgumentFilter\":true," |
"\"enableSystrace\":true," |
"\"excludedCategories\":[\"excluded\",\"exc_pattern*\"]," |
"\"includedCategories\":[\"included\"," |
- "\"inc_pattern*\"," |
- "\"disabled-by-default-cc\"," |
- "\"disabled-by-default-memory-infra\"]," |
+ "\"inc_pattern*\"," |
+ "\"disabled-by-default-cc\"," |
+ "\"disabled-by-default-memory-infra\"]," |
"\"memoryDumpConfig\":{" |
- "\"allowed_dump_modes\":[\"background\",\"light\",\"detailed\"]," |
- "\"triggers\":[" |
- "{\"mode\":\"light\",\"periodicIntervalMs\":50}," |
- "{\"mode\":\"detailed\",\"periodicIntervalMs\":1000}" |
- "]" |
+ "\"allowedDumpModes\":[\"background\",\"light\",\"detailed\"]," |
+ "\"triggers\":[" |
+ "{" |
+ "\"minTimeBetweenDumpsMs\":50," |
+ "\"mode\":\"light\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}," |
+ "{" |
+ "\"minTimeBetweenDumpsMs\":1000," |
+ "\"mode\":\"detailed\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}" |
+ "]" |
"}," |
"\"recordMode\":\"recordContinuously\"," |
"\"synthetic_delays\":[\"test.Delay1;16\",\"test.Delay2;32\"]" |
- "}"; |
+ "}"; |
} // namespace |