cc: Remove InUseByMacOSWindowServer

cc/resources/resource_provider.cc

Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 2f5325ce637a14239a5f4d9315c902ac9983b34a..deeeeecb6df7e3a6182380995c2e4fccf0f245e7 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -460,9 +460,7 @@ bool ResourceProvider::IsResourceFormatSupported(ResourceFormat format) const {
 bool ResourceProvider::InUseByConsumer(ResourceId id) {
   Resource* resource = GetResource(id);
   return resource->lock_for_read_count > 0 || resource->exported_count > 0 ||
-         resource->lost ||
-         (resource->gpu_memory_buffer &&
-          resource->gpu_memory_buffer->IsInUseByMacOSWindowServer());
+         resource->lost;
 }
 
 bool ResourceProvider::IsLost(ResourceId id) {
@@ -928,10 +926,7 @@ void ResourceProvider::UnlockForRead(ResourceId id) {
 
 ResourceProvider::Resource* ResourceProvider::LockForWrite(ResourceId id) {
   Resource* resource = GetResource(id);
-  // TODO(ccameron): The allowance for IsInUseByMacOSWindowServer should not
-  // be needed.
-  // http://crbug.com/577121
-  DCHECK(CanLockForWrite(id) || IsInUseByMacOSWindowServer(id));
+  DCHECK(CanLockForWrite(id));
   DCHECK_NE(Resource::NEEDS_WAIT, resource->synchronization_state());
   resource->locked_for_write = true;
   resource->SetLocallyUsed();
@@ -942,9 +937,7 @@ bool ResourceProvider::CanLockForWrite(ResourceId id) {
   Resource* resource = GetResource(id);
   return !resource->locked_for_write && !resource->lock_for_read_count &&
          !resource->exported_count && resource->origin == Resource::INTERNAL &&
-         !resource->lost && ReadLockFenceHasPassed(resource) &&
-         !(resource->gpu_memory_buffer &&
-           resource->gpu_memory_buffer->IsInUseByMacOSWindowServer());
+         !resource->lost && ReadLockFenceHasPassed(resource);
 }
 
 bool ResourceProvider::IsOverlayCandidate(ResourceId id) {
@@ -952,12 +945,6 @@ bool ResourceProvider::IsOverlayCandidate(ResourceId id) {
   return resource->is_overlay_candidate;
 }
 
-bool ResourceProvider::IsInUseByMacOSWindowServer(ResourceId id) {
-  Resource* resource = GetResource(id);
-  return resource->gpu_memory_buffer &&
-         resource->gpu_memory_buffer->IsInUseByMacOSWindowServer();
-}
-
 void ResourceProvider::UnlockForWrite(ResourceProvider::Resource* resource) {
   DCHECK(resource->locked_for_write);
   DCHECK_EQ(resource->exported_count, 0);