Revert of Enable promotion of RenderPassDrawQuads to CALayers.

cc/output/ca_layer_overlay.cc

Index: cc/output/ca_layer_overlay.cc
diff --git a/cc/output/ca_layer_overlay.cc b/cc/output/ca_layer_overlay.cc
index 8c06814e44a6e41e3c01cfe3ab420f2ac909e73d..dabfc1ee5b27f7fab4ea77ff912ad67feb1e7f76 100644
--- a/cc/output/ca_layer_overlay.cc
+++ b/cc/output/ca_layer_overlay.cc
@@ -16,6 +16,8 @@
 namespace cc {
 
 namespace {
+
+bool g_allow_rpdq_quad_conversion = false;
 
 // This enum is used for histogram states and should only have new values added
 // to the end before COUNT.
@@ -82,7 +84,11 @@
   ca_layer_overlay->rpdq = quad;
   ca_layer_overlay->contents_rect = gfx::RectF(0, 0, 1, 1);
 
-  return CA_LAYER_SUCCESS;
+  // TODO(erikchen): Enable this when RenderPassDrawQuad promotion to CALayer
+  // is fully functional. https://crbug.com/581526.
+  if (g_allow_rpdq_quad_conversion)
+    return CA_LAYER_SUCCESS;
+  return CA_LAYER_FAILED_RENDER_PASS;
 }
 
 CALayerResult FromStreamVideoQuad(ResourceProvider* resource_provider,
@@ -298,4 +304,8 @@
   return true;
 }
 
+void EnableRenderPassDrawQuadForTesting() {
+  g_allow_rpdq_quad_conversion = true;
+}
+
 }  // namespace cc