Update from https://crrev.com/311145

cc/resources/eviction_tile_priority_queue.cc

Index: cc/resources/eviction_tile_priority_queue.cc
diff --git a/cc/resources/eviction_tile_priority_queue.cc b/cc/resources/eviction_tile_priority_queue.cc
index fee074a50da8790bd3104d37106ada61fdb821af..46fe5ee1a76a0048469e90a6bb97976e3b537f44 100644
--- a/cc/resources/eviction_tile_priority_queue.cc
+++ b/cc/resources/eviction_tile_priority_queue.cc
@@ -128,10 +128,17 @@ EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue() {
 EvictionTilePriorityQueue::PairedTilingSetQueue::PairedTilingSetQueue(
     const PictureLayerImpl::Pair& layer_pair,
     TreePriority tree_priority) {
-  if (layer_pair.active)
-    active_queue = layer_pair.active->CreateEvictionQueue(tree_priority);
-  if (layer_pair.pending)
-    pending_queue = layer_pair.pending->CreateEvictionQueue(tree_priority);
+  bool skip_shared_out_of_order_tiles = layer_pair.active && layer_pair.pending;
+  if (layer_pair.active) {
+    active_queue = make_scoped_ptr(new TilingSetEvictionQueue(
+        layer_pair.active->picture_layer_tiling_set(), tree_priority,
+        skip_shared_out_of_order_tiles));
+  }
+  if (layer_pair.pending) {
+    pending_queue = make_scoped_ptr(new TilingSetEvictionQueue(
+        layer_pair.pending->picture_layer_tiling_set(), tree_priority,
+        skip_shared_out_of_order_tiles));
+  }
 }
 
 EvictionTilePriorityQueue::PairedTilingSetQueue::~PairedTilingSetQueue() {