Update from https://crrev.com/304715

cc/test/fake_picture_layer.cc

Index: cc/test/fake_picture_layer.cc
diff --git a/cc/test/fake_picture_layer.cc b/cc/test/fake_picture_layer.cc
index 1a19bc78ce64428f226e4d08a3252d09b4f31b1b..a47566725b7ce5452b105c80c82507297b005dae 100644
--- a/cc/test/fake_picture_layer.cc
+++ b/cc/test/fake_picture_layer.cc
@@ -13,7 +13,8 @@ FakePictureLayer::FakePictureLayer(ContentLayerClient* client)
       update_count_(0),
       push_properties_count_(0),
       output_surface_created_count_(0),
-      always_update_resources_(false) {
+      always_update_resources_(false),
+      disable_lcd_text_(false) {
   SetBounds(gfx::Size(1, 1));
   SetIsDrawable(true);
 }
@@ -38,6 +39,8 @@ scoped_ptr<LayerImpl> FakePictureLayer::CreateLayerImpl(
 
 bool FakePictureLayer::Update(ResourceUpdateQueue* queue,
                               const OcclusionTracker<Layer>* occlusion) {
+  if (disable_lcd_text_)
+    draw_properties().can_use_lcd_text = false;
   bool updated = PictureLayer::Update(queue, occlusion);
   update_count_++;
   return updated || always_update_resources_;