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

Unified Diff: chromeos/network/onc/onc_utils.cc

Issue 2816513002: Revert of Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Created 3 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/onc/onc_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_utils.cc
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 4b7b7a38d11d447f379bc28b28d8521019fd3300..7a797e9648d5445ab30a0f95e232cabf9f2df2ba 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -281,9 +281,9 @@
void ExpandStringsInNetworks(const StringSubstitution& substitution,
base::ListValue* network_configs) {
- for (auto& entry : *network_configs) {
+ for (const auto& entry : *network_configs) {
base::DictionaryValue* network = nullptr;
- entry.GetAsDictionary(&network);
+ entry->GetAsDictionary(&network);
DCHECK(network);
ExpandStringsInOncObject(
kNetworkConfigurationSignature, substitution, network);
@@ -407,7 +407,7 @@
CertPEMsByGUIDMap certs_by_guid;
for (const auto& entry : certificates) {
const base::DictionaryValue* cert = nullptr;
- bool entry_is_dictionary = entry.GetAsDictionary(&cert);
+ bool entry_is_dictionary = entry->GetAsDictionary(&cert);
DCHECK(entry_is_dictionary);
std::string guid;
@@ -435,9 +435,9 @@
}
void FillInHexSSIDFieldsInNetworks(base::ListValue* network_configs) {
- for (auto& entry : *network_configs) {
+ for (const auto& entry : *network_configs) {
base::DictionaryValue* network = nullptr;
- entry.GetAsDictionary(&network);
+ entry->GetAsDictionary(&network);
DCHECK(network);
FillInHexSSIDFieldsInOncObject(kNetworkConfigurationSignature, network);
}
@@ -603,7 +603,7 @@
std::unique_ptr<base::ListValue> pem_list(new base::ListValue);
for (const auto& entry : *guid_ref_list) {
std::string guid_ref;
- bool entry_is_string = entry.GetAsString(&guid_ref);
+ bool entry_is_string = entry->GetAsString(&guid_ref);
DCHECK(entry_is_string);
std::string pem_encoded;
@@ -730,7 +730,7 @@
for (base::ListValue::iterator it = network_configs->begin();
it != network_configs->end(); ) {
base::DictionaryValue* network = nullptr;
- it->GetAsDictionary(&network);
+ (*it)->GetAsDictionary(&network);
if (!ResolveServerCertRefsInNetwork(certs_by_guid, network)) {
std::string guid;
network->GetStringWithoutPathExpansion(network_config::kGUID, &guid);
@@ -857,7 +857,7 @@
for (base::ListValue::const_iterator it = onc_exclude_domains.begin();
it != onc_exclude_domains.end(); ++it) {
std::string rule;
- it->GetAsString(&rule);
+ (*it)->GetAsString(&rule);
rules.AddRuleFromString(rule);
}
return rules;
@@ -1043,7 +1043,7 @@
for (base::ListValue::const_iterator it = network_configs.begin();
it != network_configs.end(); ++it) {
const base::DictionaryValue* network = NULL;
- it->GetAsDictionary(&network);
+ (*it)->GetAsDictionary(&network);
DCHECK(network);
std::string current_guid;
@@ -1061,7 +1061,7 @@
for (base::ListValue::const_iterator it = network_configs.begin();
it != network_configs.end(); ++it) {
const base::DictionaryValue* network = NULL;
- it->GetAsDictionary(&network);
+ (*it)->GetAsDictionary(&network);
DCHECK(network);
std::string type;
@@ -1187,7 +1187,7 @@
for (base::ListValue::const_iterator it = expanded_networks->begin();
it != expanded_networks->end(); ++it) {
const base::DictionaryValue* network = NULL;
- it->GetAsDictionary(&network);
+ (*it)->GetAsDictionary(&network);
DCHECK(network);
// Remove irrelevant fields.
« no previous file with comments | « chromeos/network/onc/onc_translator_shill_to_onc.cc ('k') | chromeos/network/onc/onc_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698