Update from https://crrev.com/311145

cc/layers/picture_layer_impl.h

Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index 088477b09a991572ed21abe1a09a2df22e6fc9ee..57947cc0775523a30bb857e99c199c8d0615a4bf 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -16,7 +16,6 @@
 #include "cc/resources/picture_layer_tiling_set.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/resources/tiling_set_eviction_queue.h"
-#include "cc/resources/tiling_set_raster_queue.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
@@ -48,10 +47,6 @@ class CC_EXPORT PictureLayerImpl
 
   bool is_mask() const { return is_mask_; }
 
-  scoped_ptr<TilingSetEvictionQueue> CreateEvictionQueue(
-      TreePriority tree_priority);
-  scoped_ptr<TilingSetRasterQueue> CreateRasterQueue(bool prioritize_low_res);
-
   // LayerImpl overrides.
   const char* LayerTypeAsString() const override;
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
@@ -95,6 +90,8 @@ class CC_EXPORT PictureLayerImpl
 
   bool CanHaveTilings() const;
 
+  PictureLayerTilingSet* picture_layer_tiling_set() { return tilings_.get(); }
+
   // Functions used by tile manager.
   PictureLayerImpl* GetPendingOrActiveTwinLayer() const;
   bool IsOnActiveOrPendingTree() const;