OLD | NEW |
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/tracing/trace_config_file.h" | 5 #include "components/tracing/trace_config_file.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/files/file_util.h" | 12 #include "base/files/file_util.h" |
13 #include "base/json/json_reader.h" | 13 #include "base/json/json_reader.h" |
| 14 #include "base/json/json_writer.h" |
14 #include "base/logging.h" | 15 #include "base/logging.h" |
15 #include "base/memory/singleton.h" | 16 #include "base/memory/singleton.h" |
16 #include "base/values.h" | 17 #include "base/values.h" |
17 #include "build/build_config.h" | 18 #include "build/build_config.h" |
18 #include "components/tracing/tracing_switches.h" | 19 #include "components/tracing/tracing_switches.h" |
19 | 20 |
20 namespace tracing { | 21 namespace tracing { |
21 | 22 |
22 namespace { | 23 namespace { |
23 | 24 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) | 101 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) |
101 return false; | 102 return false; |
102 | 103 |
103 scoped_ptr<base::DictionaryValue> dict( | 104 scoped_ptr<base::DictionaryValue> dict( |
104 static_cast<base::DictionaryValue*>(value.release())); | 105 static_cast<base::DictionaryValue*>(value.release())); |
105 | 106 |
106 base::DictionaryValue* trace_config_dict = NULL; | 107 base::DictionaryValue* trace_config_dict = NULL; |
107 if (!dict->GetDictionary(kTraceConfigParam, &trace_config_dict)) | 108 if (!dict->GetDictionary(kTraceConfigParam, &trace_config_dict)) |
108 return false; | 109 return false; |
109 | 110 |
110 trace_config_ = base::trace_event::TraceConfig(*trace_config_dict); | 111 std::string trace_config_str; |
| 112 base::JSONWriter::Write(*trace_config_dict, &trace_config_str); |
| 113 trace_config_ = base::trace_event::TraceConfig(trace_config_str); |
111 | 114 |
112 if (!dict->GetInteger(kStartupDurationParam, &startup_duration_)) | 115 if (!dict->GetInteger(kStartupDurationParam, &startup_duration_)) |
113 startup_duration_ = 0; | 116 startup_duration_ = 0; |
114 | 117 |
115 if (startup_duration_ < 0) | 118 if (startup_duration_ < 0) |
116 startup_duration_ = 0; | 119 startup_duration_ = 0; |
117 | 120 |
118 base::FilePath::StringType result_file_str; | 121 base::FilePath::StringType result_file_str; |
119 if (dict->GetString(kResultFileParam, &result_file_str)) | 122 if (dict->GetString(kResultFileParam, &result_file_str)) |
120 result_file_ = base::FilePath(result_file_str); | 123 result_file_ = base::FilePath(result_file_str); |
(...skipping 16 matching lines...) Expand all Loading... |
137 } | 140 } |
138 | 141 |
139 #if !defined(OS_ANDROID) | 142 #if !defined(OS_ANDROID) |
140 base::FilePath TraceConfigFile::GetResultFile() const { | 143 base::FilePath TraceConfigFile::GetResultFile() const { |
141 DCHECK(IsEnabled()); | 144 DCHECK(IsEnabled()); |
142 return result_file_; | 145 return result_file_; |
143 } | 146 } |
144 #endif | 147 #endif |
145 | 148 |
146 } // namespace tracing | 149 } // namespace tracing |
OLD | NEW |