Revert of Optimize render passes with single quads

cc/test/solid_color_content_layer_client.h

Index: cc/test/solid_color_content_layer_client.h
diff --git a/cc/test/solid_color_content_layer_client.h b/cc/test/solid_color_content_layer_client.h
index d8fcd70c48a8500b2404ae359692073ca07f2db0..d765f94d346d7986d40daa6b84115b7bbbb067f2 100644
--- a/cc/test/solid_color_content_layer_client.h
+++ b/cc/test/solid_color_content_layer_client.h
@@ -16,15 +16,7 @@ namespace cc {
 class SolidColorContentLayerClient : public ContentLayerClient {
  public:
   explicit SolidColorContentLayerClient(SkColor color, gfx::Size size)
-      : color_(color), size_(size), border_size_(0), border_color_(0) {}
-  explicit SolidColorContentLayerClient(SkColor color,
-                                        gfx::Size size,
-                                        int border_size,
-                                        SkColor border_color)
-      : color_(color),
-        size_(size),
-        border_size_(border_size),
-        border_color_(border_color) {}
+      : color_(color), size_(size) {}
 
   gfx::Rect PaintableRegion() override;
 
@@ -37,8 +29,6 @@ class SolidColorContentLayerClient : public ContentLayerClient {
  private:
   SkColor color_;
   gfx::Size size_;
-  int border_size_;
-  SkColor border_color_;
 };
 
 }  // namespace cc