| Index: content/browser/tracing/background_tracing_config_unittest.cc | 
| diff --git a/content/browser/tracing/background_tracing_config_unittest.cc b/content/browser/tracing/background_tracing_config_unittest.cc | 
| index 34c206be9d76db338ec7210b826048a7080e530e..a6a5ebfc25e3af441e5542ff95483b7e5a38f372 100644 | 
| --- a/content/browser/tracing/background_tracing_config_unittest.cc | 
| +++ b/content/browser/tracing/background_tracing_config_unittest.cc | 
| @@ -256,6 +256,17 @@ TEST_F(BackgroundTracingConfigTest, PreemptiveConfigFromValidString) { | 
| EXPECT_EQ(RuleToString(config->rules()[1]), | 
| "{\"rule\":\"MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED\"," | 
| "\"trigger_name\":\"foo2\"}"); | 
| + | 
| +  config = ReadFromJSONString( | 
| +      "{\"category\":\"BENCHMARK_DEEP\",\"configs\":[{\"rule\":" | 
| +      "\"MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED\",\"trigger_name\":" | 
| +      "\"foo1\"}],\"disable_blink_features\":\"SlowerWeb1,SlowerWeb2\"," | 
| +      "\"enable_blink_features\":\"FasterWeb1,FasterWeb2\"," | 
| +      "\"mode\":\"PREEMPTIVE_TRACING_MODE\"," | 
| +      "\"scenario_name\":\"my_awesome_experiment\"}"); | 
| +  EXPECT_EQ(config->enable_blink_features(), "FasterWeb1,FasterWeb2"); | 
| +  EXPECT_EQ(config->disable_blink_features(), "SlowerWeb1,SlowerWeb2"); | 
| +  EXPECT_EQ(config->scenario_name(), "my_awesome_experiment"); | 
| } | 
|  | 
| TEST_F(BackgroundTracingConfigTest, ReactiveConfigFromValidString) { | 
| @@ -406,6 +417,29 @@ TEST_F(BackgroundTracingConfigTest, ValidPreemptiveConfigToString) { | 
| "SPECIFIC_HISTOGRAM_AND_VALUE\",\"trigger_delay\":10}],\"mode\":" | 
| "\"PREEMPTIVE_TRACING_MODE\"}"); | 
| } | 
| + | 
| +  { | 
| +    config.reset( | 
| +        new BackgroundTracingConfigImpl(BackgroundTracingConfig::PREEMPTIVE)); | 
| +    config->set_category_preset(BackgroundTracingConfigImpl::BENCHMARK_DEEP); | 
| + | 
| +    scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 
| +    dict->SetString("rule", "MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED"); | 
| +    dict->SetString("trigger_name", "foo1"); | 
| +    config->AddPreemptiveRule(dict.get()); | 
| + | 
| +    config->scenario_name_ = "my_awesome_experiment"; | 
| +    config->enable_blink_features_ = "FasterWeb1,FasterWeb2"; | 
| +    config->disable_blink_features_ = "SlowerWeb1,SlowerWeb2"; | 
| + | 
| +    EXPECT_EQ(ConfigToString(config.get()), | 
| +              "{\"category\":\"BENCHMARK_DEEP\",\"configs\":[{\"rule\":" | 
| +              "\"MONITOR_AND_DUMP_WHEN_TRIGGER_NAMED\",\"trigger_name\":" | 
| +              "\"foo1\"}],\"disable_blink_features\":\"SlowerWeb1,SlowerWeb2\"," | 
| +              "\"enable_blink_features\":\"FasterWeb1,FasterWeb2\"," | 
| +              "\"mode\":\"PREEMPTIVE_TRACING_MODE\"," | 
| +              "\"scenario_name\":\"my_awesome_experiment\"}"); | 
| +  } | 
| } | 
|  | 
| TEST_F(BackgroundTracingConfigTest, InvalidPreemptiveConfigToString) { | 
|  |