Made return types of various Value::DeepCopy() implementations more specific

chrome/browser/sync/glue/preference_model_associator.cc

 // Copyright (c) 2010 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/sync/glue/preference_model_associator.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
@@ skipping 245 matching lines @@
                                                   const Value& to_value) {
   if (from_value.GetType() == Value::TYPE_NULL)
     return to_value.DeepCopy();
   if (to_value.GetType() == Value::TYPE_NULL)
     return from_value.DeepCopy();
 
   DCHECK(from_value.GetType() == Value::TYPE_LIST);
   DCHECK(to_value.GetType() == Value::TYPE_LIST);
   const ListValue& from_list_value = static_cast<const ListValue&>(from_value);
   const ListValue& to_list_value = static_cast<const ListValue&>(to_value);
-  ListValue* result = static_cast<ListValue*>(to_list_value.DeepCopy());
+  ListValue* result = to_list_value.DeepCopy();
 
   for (ListValue::const_iterator i = from_list_value.begin();
        i != from_list_value.end(); ++i) {
     Value* value = (*i)->DeepCopy();
     if (!result->AppendIfNotPresent(value))
       delete value;
   }
   return result;
 }
 
 Value* PreferenceModelAssociator::MergeDictionaryValues(
     const Value& from_value,
     const Value& to_value) {
   if (from_value.GetType() == Value::TYPE_NULL)
     return to_value.DeepCopy();
   if (to_value.GetType() == Value::TYPE_NULL)
     return from_value.DeepCopy();
 
   DCHECK(from_value.GetType() == Value::TYPE_DICTIONARY);
   DCHECK(to_value.GetType() == Value::TYPE_DICTIONARY);
   const DictionaryValue& from_dict_value =
       static_cast<const DictionaryValue&>(from_value);
   const DictionaryValue& to_dict_value =
       static_cast<const DictionaryValue&>(to_value);
-  DictionaryValue* result =
-      static_cast<DictionaryValue*>(to_dict_value.DeepCopy());
+  DictionaryValue* result = to_dict_value.DeepCopy();
 
   for (DictionaryValue::key_iterator key = from_dict_value.begin_keys();
        key != from_dict_value.end_keys(); ++key) {
     Value* from_value;
     bool success = from_dict_value.GetWithoutPathExpansion(*key, &from_value);
     DCHECK(success);
 
     Value* to_key_value;
     if (result->GetWithoutPathExpansion(*key, &to_key_value)) {
       if (to_key_value->GetType() == Value::TYPE_DICTIONARY) {
@@ skipping 15 matching lines @@
   // notification to update the UI.
   if (0 == pref_name.compare(prefs::kShowBookmarkBar)) {
     NotificationService::current()->Notify(
         NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
         Source<PreferenceModelAssociator>(this),
         NotificationService::NoDetails());
   }
 }
 
 }  // namespace browser_sync