Revert two cc patches due to crashes on canary.

cc/debug/rasterize_and_record_benchmark_impl.cc

Index: cc/debug/rasterize_and_record_benchmark_impl.cc
diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
index 0310b1013161b60d41d67345e30f489f5502ebfd..612dad8249caf3558e12a99098e3c9ee297ed54c 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.cc
+++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
@@ -106,12 +106,12 @@ class FixedInvalidationPictureLayerTilingClient
   }
 
   // This is the only function that returns something different from the base
-  // client. Avoids sharing tiles in this area.
-  const Region* GetPendingInvalidation() override { return &invalidation_; }
+  // client.
+  const Region* GetInvalidation() override { return &invalidation_; }
 
-  const PictureLayerTiling* GetPendingOrActiveTwinTiling(
+  const PictureLayerTiling* GetTwinTiling(
       const PictureLayerTiling* tiling) const override {
-    return base_client_->GetPendingOrActiveTwinTiling(tiling);
+    return base_client_->GetTwinTiling(tiling);
   }
 
   PictureLayerTiling* GetRecycledTwinTiling(