| Index: components/tracing/trace_config_file.cc
|
| diff --git a/components/tracing/trace_config_file.cc b/components/tracing/trace_config_file.cc
|
| index 56e3ea5cf2bcdf429fbfb0eef011b2c6a9526576..670bcc9c2064d52257d973c4d7a1a9878812d85b 100644
|
| --- a/components/tracing/trace_config_file.cc
|
| +++ b/components/tracing/trace_config_file.cc
|
| @@ -11,6 +11,7 @@
|
| #include "base/command_line.h"
|
| #include "base/files/file_util.h"
|
| #include "base/json/json_reader.h"
|
| +#include "base/json/json_writer.h"
|
| #include "base/logging.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/values.h"
|
| @@ -107,7 +108,9 @@
|
| if (!dict->GetDictionary(kTraceConfigParam, &trace_config_dict))
|
| return false;
|
|
|
| - trace_config_ = base::trace_event::TraceConfig(*trace_config_dict);
|
| + std::string trace_config_str;
|
| + base::JSONWriter::Write(*trace_config_dict, &trace_config_str);
|
| + trace_config_ = base::trace_event::TraceConfig(trace_config_str);
|
|
|
| if (!dict->GetInteger(kStartupDurationParam, &startup_duration_))
|
| startup_duration_ = 0;
|
|
|