Chromium Code Reviews| Index: content/browser/tracing/background_tracing_config_impl.cc |
| diff --git a/content/browser/tracing/background_tracing_config_impl.cc b/content/browser/tracing/background_tracing_config_impl.cc |
| index cc944ce90ef6a624284c8c43f8fbf29d0f9d2a2f..e0e42c24ffa84d8b46ba361d981c4697e5bf95e6 100644 |
| --- a/content/browser/tracing/background_tracing_config_impl.cc |
| +++ b/content/browser/tracing/background_tracing_config_impl.cc |
| @@ -17,6 +17,10 @@ const char kConfigModeKey[] = "mode"; |
| const char kConfigModePreemptive[] = "PREEMPTIVE_TRACING_MODE"; |
| const char kConfigModeReactive[] = "REACTIVE_TRACING_MODE"; |
| +const char kConfigScenarioName[] = "scenario_name"; |
| +const char kConfigEnableBlinkFeatures[] = "enable_blink_features"; |
| +const char kConfigDisableBlinkFeatures[] = "disable_blink_features"; |
| + |
| const char kConfigCategoryKey[] = "category"; |
| const char kConfigCategoryBenchmark[] = "BENCHMARK"; |
| const char kConfigCategoryBenchmarkDeep[] = "BENCHMARK_DEEP"; |
| @@ -103,6 +107,13 @@ void BackgroundTracingConfigImpl::IntoDict(base::DictionaryValue* dict) const { |
| } |
| dict->Set(kConfigsKey, configs_list.Pass()); |
| + |
| + if (!scenario_name_.empty()) |
| + dict->SetString(kConfigScenarioName, scenario_name_); |
| + if (!enable_blink_features_.empty()) |
| + dict->SetString(kConfigEnableBlinkFeatures, enable_blink_features_); |
| + if (!disable_blink_features_.empty()) |
| + dict->SetString(kConfigDisableBlinkFeatures, disable_blink_features_); |
| } |
| void BackgroundTracingConfigImpl::AddPreemptiveRule( |
| @@ -140,6 +151,12 @@ scoped_ptr<BackgroundTracingConfigImpl> BackgroundTracingConfigImpl::FromDict( |
| return nullptr; |
| } |
| + dict->GetString(kConfigScenarioName, &config->scenario_name_); |
| + dict->GetString(kConfigEnableBlinkFeatures, &config->enable_blink_features_); |
|
shatch
2015/10/26 15:24:45
Once is probably enough.
oystein (OOO til 10th of July)
2015/10/26 18:28:39
Oops. But what if it's wrong the first time? :'(.
|
| + dict->GetString(kConfigEnableBlinkFeatures, &config->enable_blink_features_); |
| + dict->GetString(kConfigDisableBlinkFeatures, |
| + &config->disable_blink_features_); |
| + |
| return config.Pass(); |
| } |