Revert of Optimize render passes with single quads

cc/test/solid_color_content_layer_client.cc

Index: cc/test/solid_color_content_layer_client.cc
diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc
index efa63552664ebc0e482e6fe054c0faea23aa7f26..3340c15319bc1f747fb2470f9d136861aaefa70e 100644
--- a/cc/test/solid_color_content_layer_client.cc
+++ b/cc/test/solid_color_content_layer_client.cc
@@ -29,25 +29,13 @@ SolidColorContentLayerClient::PaintContentsToDisplayList(
   sk_sp<SkCanvas> canvas =
       sk_ref_sp(recorder.beginRecording(gfx::RectToSkRect(clip)));
 
-  canvas->clear(SK_ColorTRANSPARENT);
-
-  if (border_size_ != 0) {
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(border_color_);
-    canvas->drawRect(
-        SkRect::MakeXYWH(clip.x(), clip.y(), clip.width(), clip.height()),
-        paint);
-  }
-
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(color_);
+
+  canvas->clear(SK_ColorTRANSPARENT);
   canvas->drawRect(
-      SkRect::MakeXYWH(clip.x() + border_size_, clip.y() + border_size_,
-                       clip.width() - 2 * border_size_,
-                       clip.height() - 2 * border_size_),
-      paint);
+      SkRect::MakeXYWH(clip.x(), clip.y(), clip.width(), clip.height()), paint);
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;