Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

cc/test/layer_tree_json_parser.cc

 // Copyright 2013 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 "cc/test/layer_tree_json_parser.h"
 
 #include <stddef.h>
 
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/trees/layer_tree_settings.h"
 
 namespace cc {
 
 namespace {
 
-scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
+scoped_refptr<Layer> ParseTreeFromValue(const base::Value& val,
                                         ContentLayerClient* content_client) {
-  base::DictionaryValue* dict;
+  const base::DictionaryValue* dict;
   bool success = true;
-  success &= val->GetAsDictionary(&dict);
+  success &= val.GetAsDictionary(&dict);
   std::string layer_type;
   success &= dict->GetString("LayerType", &layer_type);
-  base::ListValue* list;
+  const base::ListValue* list;
   success &= dict->GetList("Bounds", &list);
   int width, height;
   success &= list->GetInteger(0, &width);
   success &= list->GetInteger(1, &height);
   success &= dict->GetList("Position", &list);
   double position_x, position_y;
   success &= list->GetDouble(0, &position_x);
   success &= list->GetDouble(1, &position_y);
 
   bool draws_content;
   success &= dict->GetBoolean("DrawsContent", &draws_content);
 
   scoped_refptr<Layer> new_layer;
   if (layer_type == "SolidColorLayer") {
     new_layer = SolidColorLayer::Create();
   } else if (layer_type == "NinePatchLayer") {
     success &= dict->GetList("ImageAperture", &list);
     int aperture_x, aperture_y, aperture_width, aperture_height;
     success &= list->GetInteger(0, &aperture_x);
     success &= list->GetInteger(1, &aperture_y);
     success &= list->GetInteger(2, &aperture_width);
     success &= list->GetInteger(3, &aperture_height);
 
-    base::ListValue* bounds;
+    const base::ListValue* bounds;
     success &= dict->GetList("ImageBounds", &bounds);
     double image_width, image_height;
     success &= bounds->GetDouble(0, &image_width);
     success &= bounds->GetDouble(1, &image_height);
 
     success &= dict->GetList("Border", &list);
     int border_x, border_y, border_width, border_height;
     success &= list->GetInteger(0, &border_x);
     success &= list->GetInteger(1, &border_y);
     success &= list->GetInteger(2, &border_width);
@@ skipping 80 matching lines @@
   success &= dict->GetList("Transform", &list);
   double transform[16];
   for (int i = 0; i < 16; ++i)
     success &= list->GetDouble(i, &transform[i]);
 
   gfx::Transform layer_transform;
   layer_transform.matrix().setColMajord(transform);
   new_layer->SetTransform(layer_transform);
 
   success &= dict->GetList("Children", &list);
-  for (base::ListValue::const_iterator it = list->begin();
-       it != list->end(); ++it) {
-    new_layer->AddChild(ParseTreeFromValue(*it, content_client));
+  for (const auto& value : *list) {
+    new_layer->AddChild(ParseTreeFromValue(*value, content_client));
   }
 
   if (!success)
     return NULL;
 
   return new_layer;
 }
 
 }  // namespace
 
 scoped_refptr<Layer> ParseTreeFromJson(std::string json,
                                        ContentLayerClient* content_client) {
   std::unique_ptr<base::Value> val = base::test::ParseJson(json);
-  return ParseTreeFromValue(val.get(), content_client);
+  return ParseTreeFromValue(*val, content_client);
 }
 
 }  // namespace cc