Update from https://crrev.com/311076

cc/resources/scoped_resource.cc

Index: cc/resources/scoped_resource.cc
diff --git a/cc/resources/scoped_resource.cc b/cc/resources/scoped_resource.cc
index c83efb59fd9a78f13c1ba2c75d27f830850799ad..3b135590fe5cd5222172424ca642cb200f01acd1 100644
--- a/cc/resources/scoped_resource.cc
+++ b/cc/resources/scoped_resource.cc
@@ -25,7 +25,7 @@ void ScopedResource::Allocate(const gfx::Size& size,
   set_id(resource_provider_->CreateResource(
       size, GL_CLAMP_TO_EDGE, hint, format));
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   allocate_thread_id_ = base::PlatformThread::CurrentId();
 #endif
 }
@@ -44,14 +44,14 @@ void ScopedResource::AllocateManaged(const gfx::Size& size,
       ResourceProvider::TextureHintImmutable,
       format));
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   allocate_thread_id_ = base::PlatformThread::CurrentId();
 #endif
 }
 
 void ScopedResource::Free() {
   if (id()) {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
     DCHECK(allocate_thread_id_ == base::PlatformThread::CurrentId());
 #endif
     resource_provider_->DeleteResource(id());