Update from https://crrev.com/305340

cc/trees/layer_tree_settings.h

Index: cc/trees/layer_tree_settings.h
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 69ac995d22885389303c6db107adbeaf31f698fc..ebbe7f799f7e2143ffe11668fdf7198d491be26e 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/layer_tree_debug_state.h"
+#include "cc/output/renderer_settings.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -18,10 +19,8 @@ class CC_EXPORT LayerTreeSettings {
   LayerTreeSettings();
   ~LayerTreeSettings();
 
+  RendererSettings renderer_settings;
   bool impl_side_painting;
-  bool allow_antialiasing;
-  bool force_antialiasing;
-  bool force_blending_with_shaders;
   bool throttle_frame_production;
   bool single_thread_proxy_scheduler;
   bool use_external_begin_frame_source;
@@ -31,11 +30,9 @@ class CC_EXPORT LayerTreeSettings {
   bool disable_hi_res_timer_tasks_on_battery;
   bool report_overscroll_only_for_scrollable_axes;
   bool per_tile_painting_enabled;
-  bool partial_swap_enabled;
   bool accelerated_animation_enabled;
   bool can_use_lcd_text;
   bool use_distance_field_text;
-  bool should_clear_root_render_pass;
   bool gpu_rasterization_enabled;
   bool gpu_rasterization_forced;
   bool create_low_res_tiling;
@@ -60,7 +57,6 @@ class CC_EXPORT LayerTreeSettings {
   float top_controls_height;
   float top_controls_show_threshold;
   float top_controls_hide_threshold;
-  double refresh_rate;
   double background_animation_rate;
   size_t max_partial_texture_updates;
   gfx::Size default_tile_size;
@@ -74,13 +70,10 @@ class CC_EXPORT LayerTreeSettings {
   int skewport_extrapolation_limit_in_content_pixels;
   size_t max_unused_resource_memory_percentage;
   size_t max_memory_for_prepaint_percentage;
-  int highp_threshold_min;
   bool strict_layer_property_change_checking;
   bool use_one_copy;
   bool use_zero_copy;
   bool ignore_root_layer_flings;
-  bool use_rgba_4444_textures;
-  size_t texture_id_allocation_chunk_size;
   size_t scheduled_raster_task_limit;
   bool use_occlusion_for_tile_prioritization;
   bool record_full_layer;