Update from https://crrev.com/304715

cc/test/layer_tree_host_common_test.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 #define CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 50 matching lines @@
                                     const gfx::Point3F& transform_origin,
                                     const gfx::PointF& position,
                                     const gfx::Size& bounds,
                                     bool flatten_transform,
                                     bool is_3d_sorted);
 
   void ExecuteCalculateDrawProperties(Layer* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       Layer* page_scale_application_layer,
-                                      bool can_use_lcd_text);
+                                      bool can_use_lcd_text,
+                                      bool layers_always_allowed_lcd_text);
 
   void ExecuteCalculateDrawProperties(LayerImpl* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       LayerImpl* page_scale_application_layer,
-                                      bool can_use_lcd_text);
+                                      bool can_use_lcd_text,
+                                      bool layers_always_allowed_lcd_text);
 
   template <class LayerType>
   void ExecuteCalculateDrawProperties(LayerType* root_layer) {
     LayerType* page_scale_application_layer = NULL;
-    ExecuteCalculateDrawProperties(
-        root_layer, 1.f, 1.f, page_scale_application_layer, false);
+    ExecuteCalculateDrawProperties(root_layer, 1.f, 1.f,
+                                   page_scale_application_layer, false, false);
   }
 
   template <class LayerType>
   void ExecuteCalculateDrawProperties(LayerType* root_layer,
                                       float device_scale_factor) {
     LayerType* page_scale_application_layer = NULL;
-    ExecuteCalculateDrawProperties(root_layer,
-                                   device_scale_factor,
-                                   1.f,
-                                   page_scale_application_layer,
-                                   false);
+    ExecuteCalculateDrawProperties(root_layer, device_scale_factor, 1.f,
+                                   page_scale_application_layer, false, false);
   }
 
   template <class LayerType>
   void ExecuteCalculateDrawProperties(LayerType* root_layer,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       LayerType* page_scale_application_layer) {
-    ExecuteCalculateDrawProperties(root_layer,
-                                   device_scale_factor,
+    ExecuteCalculateDrawProperties(root_layer, device_scale_factor,
                                    page_scale_factor,
-                                   page_scale_application_layer,
-                                   false);
+                                   page_scale_application_layer, false, false);
   }
 
   RenderSurfaceLayerList* render_surface_layer_list() const {
     return render_surface_layer_list_.get();
   }
 
   LayerImplList* render_surface_layer_list_impl() const {
     return render_surface_layer_list_impl_.get();
   }
 
@@ skipping 10 matching lines @@
   FakeLayerTreeHostClient client_;
   int render_surface_layer_list_count_;
 };
 
 class LayerTreeHostCommonTest : public LayerTreeHostCommonTestBase,
                                 public testing::Test {};
 
 }  // namespace cc
 
 #endif  // CC_TEST_LAYER_TREE_HOST_COMMON_TEST_H_