Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: components/tracing/browser/trace_config_file.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/browser/trace_config_file.h" 5 #include "components/tracing/browser/trace_config_file.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 is_enabled_ = ParseTraceConfigFileContent(trace_config_file_content); 91 is_enabled_ = ParseTraceConfigFileContent(trace_config_file_content);
92 if (!is_enabled_) 92 if (!is_enabled_)
93 DLOG(WARNING) << "Cannot parse the trace config file correctly."; 93 DLOG(WARNING) << "Cannot parse the trace config file correctly.";
94 } 94 }
95 95
96 TraceConfigFile::~TraceConfigFile() { 96 TraceConfigFile::~TraceConfigFile() {
97 } 97 }
98 98
99 bool TraceConfigFile::ParseTraceConfigFileContent(const std::string& content) { 99 bool TraceConfigFile::ParseTraceConfigFileContent(const std::string& content) {
100 std::unique_ptr<base::Value> value(base::JSONReader::Read(content)); 100 std::unique_ptr<base::Value> value(base::JSONReader::Read(content));
101 if (!value || !value->IsType(base::Value::TYPE_DICTIONARY)) 101 if (!value || !value->IsType(base::Value::Type::DICTIONARY))
102 return false; 102 return false;
103 103
104 std::unique_ptr<base::DictionaryValue> dict( 104 std::unique_ptr<base::DictionaryValue> dict(
105 static_cast<base::DictionaryValue*>(value.release())); 105 static_cast<base::DictionaryValue*>(value.release()));
106 106
107 base::DictionaryValue* trace_config_dict = NULL; 107 base::DictionaryValue* trace_config_dict = NULL;
108 if (!dict->GetDictionary(kTraceConfigParam, &trace_config_dict)) 108 if (!dict->GetDictionary(kTraceConfigParam, &trace_config_dict))
109 return false; 109 return false;
110 110
111 trace_config_ = base::trace_event::TraceConfig(*trace_config_dict); 111 trace_config_ = base::trace_event::TraceConfig(*trace_config_dict);
(...skipping 26 matching lines...) Expand all
138 } 138 }
139 139
140 #if !defined(OS_ANDROID) 140 #if !defined(OS_ANDROID)
141 base::FilePath TraceConfigFile::GetResultFile() const { 141 base::FilePath TraceConfigFile::GetResultFile() const {
142 DCHECK(IsEnabled()); 142 DCHECK(IsEnabled());
143 return result_file_; 143 return result_file_;
144 } 144 }
145 #endif 145 #endif
146 146
147 } // namespace tracing 147 } // namespace tracing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698