Revert of Change base::Value::ListStorage to std::vector<base::Value>

chromeos/network/onc/onc_merger.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_merger.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 38 matching lines @@
 // |policy|.
 void MarkRecommendedFieldnames(const base::DictionaryValue& policy,
                                base::DictionaryValue* result) {
   const base::ListValue* recommended_value = NULL;
   if (!policy.GetListWithoutPathExpansion(::onc::kRecommended,
                                           &recommended_value))
     return;
   for (base::ListValue::const_iterator it = recommended_value->begin();
        it != recommended_value->end(); ++it) {
     std::string entry;
-    if (it->GetAsString(&entry))
+    if ((*it)->GetAsString(&entry))
       result->SetBooleanWithoutPathExpansion(entry, true);
   }
 }
 
 // Returns a dictionary which contains |true| at each path that is editable by
 // the user. No other fields are set.
 DictionaryPtr GetEditableFlags(const base::DictionaryValue& policy) {
   DictionaryPtr result_editable(new base::DictionaryValue);
   MarkRecommendedFieldnames(policy, result_editable.get());
 
@@ skipping 436 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos