summaryrefslogtreecommitdiff
path: root/chromium/content/browser/tracing/tracing_ui_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/browser/tracing/tracing_ui_unittest.cc')
-rw-r--r--chromium/content/browser/tracing/tracing_ui_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/content/browser/tracing/tracing_ui_unittest.cc b/chromium/content/browser/tracing/tracing_ui_unittest.cc
index 431949fec9c..51f63a44a25 100644
--- a/chromium/content/browser/tracing/tracing_ui_unittest.cc
+++ b/chromium/content/browser/tracing/tracing_ui_unittest.cc
@@ -34,6 +34,7 @@ std::string GetConfig() {
dict->SetList("excluded_categories", std::move(excluded));
dict->SetString("record_mode", "record-continuously");
dict->SetBoolean("enable_systrace", true);
+ dict->SetString("stream_format", "protobuf");
std::unique_ptr<base::DictionaryValue> memory_config(
new base::DictionaryValue());
@@ -56,12 +57,14 @@ std::string GetConfig() {
TEST_F(TracingUITest, ConfigParsing) {
base::trace_event::TraceConfig config;
- ASSERT_TRUE(TracingUI::GetTracingOptions(GetConfig(), &config));
+ std::string stream_format;
+ ASSERT_TRUE(TracingUI::GetTracingOptions(GetConfig(), config, stream_format));
EXPECT_EQ(config.GetTraceRecordMode(),
base::trace_event::RECORD_CONTINUOUSLY);
std::string expected(base::trace_event::MemoryDumpManager::kTraceCategory);
expected += ",-filter2";
EXPECT_EQ(config.ToCategoryFilterString(), expected);
+ EXPECT_EQ(stream_format, "protobuf");
EXPECT_TRUE(config.IsSystraceEnabled());
ASSERT_EQ(config.memory_dump_config().triggers.size(), 1u);