Merge 170403 - Use a lock to deal with concurrent access to the m_evictedBackings

cc/tiled_layer_unittest.cc

Index: cc/tiled_layer_unittest.cc
diff --git a/cc/tiled_layer_unittest.cc b/cc/tiled_layer_unittest.cc
index ffa8461c4c6e3429167eb98c6bc1400885ec23fa..28e045aa9c11388a92667243d6fa42ba55bb7457 100644
--- a/cc/tiled_layer_unittest.cc
+++ b/cc/tiled_layer_unittest.cc
@@ -93,9 +93,12 @@ public:
     };
     void textureManagerClearAllMemory(PrioritizedTextureManager* textureManager, ResourceProvider* resourceProvider)
     {
-        DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
-        textureManager->clearAllMemory(resourceProvider);
-        textureManager->reduceMemory(resourceProvider);
+        {
+            DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
+            textureManager->clearAllMemory(resourceProvider);
+            textureManager->reduceMemory(resourceProvider);
+        }
+        textureManager->unlinkAndClearEvictedBackings();
     }
     void updateTextures()
     {