Add base namespace to more values in sync and elsewhere.

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 <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_constants.h"
 #include "chromeos/network/onc/onc_signature.h"
 
 namespace chromeos {
 namespace onc {
 namespace {
 
 typedef scoped_ptr<base::DictionaryValue> DictionaryPtr;
 
 // Inserts |true| at every field name in |result| that is recommended in
 // |policy|.
 void MarkRecommendedFieldnames(const base::DictionaryValue& policy,
                                base::DictionaryValue* result) {
-  const ListValue* recommended_value = NULL;
+  const base::ListValue* recommended_value = NULL;
   if (!policy.GetListWithoutPathExpansion(kRecommended, &recommended_value))
     return;
-  for (ListValue::const_iterator it = recommended_value->begin();
+  for (base::ListValue::const_iterator it = recommended_value->begin();
        it != recommended_value->end(); ++it) {
     std::string 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) {
@@ skipping 394 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