Force use of and cache render surface.

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 581271731c5ad90510b582bc335461e999073947..561e03f3d485136199dc537331f3205cc1cae855 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -251,10 +251,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
     inputs_.did_scroll_callback = callback;
   }
 
-  void SetForceRenderSurfaceForTesting(bool force_render_surface);
-  bool force_render_surface_for_testing() const {
-    return force_render_surface_for_testing_;
-  }
+  void SetForceRenderSurface(bool force_render_surface);
+  bool force_render_surface() const { return force_render_surface_; }
 
   gfx::ScrollOffset CurrentScrollOffset() const {
     return inputs_.scroll_offset;
@@ -614,7 +612,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer> {
   bool draws_content_ : 1;
   bool use_local_transform_for_backface_visibility_ : 1;
   bool should_check_backface_visibility_ : 1;
-  bool force_render_surface_for_testing_ : 1;
+  bool force_render_surface_ : 1;
   bool subtree_property_changed_ : 1;
   bool may_contain_video_ : 1;
   bool is_scroll_clip_layer_ : 1;