ConfigurationPolicyPrefStore refactoring to surface error messages.

chrome/browser/prefs/pref_value_map.cc

 // Copyright (c) 2011 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 "chrome/browser/prefs/pref_value_map.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 123 matching lines @@
       ++other_pref;
     }
   }
 
   // Add the remaining entries.
   for ( ; this_pref != prefs_.end(); ++this_pref)
       differing_keys->push_back(this_pref->first);
   for ( ; other_pref != other->prefs_.end(); ++other_pref)
       differing_keys->push_back(other_pref->first);
 }
+
+void PrefValueMap::MergeFrom(const PrefValueMap* other) {
+  Map::const_iterator other_pref(other->prefs_.begin());
+  for ( ; other_pref != other->prefs_.end(); ++other_pref)
+    SetValue(other_pref->first, other_pref->second->DeepCopy());
+}