CC Animation: Erase cc::LayerSettings everywhere.

cc/test/layer_tree_json_parser.cc

Index: cc/test/layer_tree_json_parser.cc
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index 086e02377decc019890de0005f4d225cea4d3332..815700bcd06918d4cbd705663a7ea63230a4d3a7 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -9,7 +9,6 @@
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
-#include "cc/layers/layer_settings.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/layers/solid_color_layer.h"
@@ -40,11 +39,9 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
   bool draws_content;
   success &= dict->GetBoolean("DrawsContent", &draws_content);
 
-  LayerSettings layer_settings;
-
   scoped_refptr<Layer> new_layer;
   if (layer_type == "SolidColorLayer") {
-    new_layer = SolidColorLayer::Create(layer_settings);
+    new_layer = SolidColorLayer::Create();
   } else if (layer_type == "NinePatchLayer") {
     success &= dict->GetList("ImageAperture", &list);
     int aperture_x, aperture_y, aperture_width, aperture_height;
@@ -69,8 +66,7 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
     bool fill_center;
     success &= dict->GetBoolean("FillCenter", &fill_center);
 
-    scoped_refptr<NinePatchLayer> nine_patch_layer =
-        NinePatchLayer::Create(layer_settings);
+    scoped_refptr<NinePatchLayer> nine_patch_layer = NinePatchLayer::Create();
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(image_width, image_height);
@@ -84,11 +80,11 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
 
     new_layer = nine_patch_layer;
   } else if (layer_type == "TextureLayer") {
-    new_layer = TextureLayer::CreateForMailbox(layer_settings, NULL);
+    new_layer = TextureLayer::CreateForMailbox(NULL);
   } else if (layer_type == "PictureLayer") {
-    new_layer = PictureLayer::Create(layer_settings, content_client);
+    new_layer = PictureLayer::Create(content_client);
   } else {  // Type "Layer" or "unknown"
-    new_layer = Layer::Create(layer_settings);
+    new_layer = Layer::Create();
   }
   new_layer->SetPosition(gfx::PointF(position_x, position_y));
   new_layer->SetBounds(gfx::Size(width, height));