Update from https://crrev.com/311076

cc/trees/proxy.cc

Index: cc/trees/proxy.cc
diff --git a/cc/trees/proxy.cc b/cc/trees/proxy.cc
index e981a722cad6393ce40faf6bf8785fd09633cdc9..eb81e2e6735c2c17150b3b3c972b38f537f77899 100644
--- a/cc/trees/proxy.cc
+++ b/cc/trees/proxy.cc
@@ -21,7 +21,7 @@ base::SingleThreadTaskRunner* Proxy::ImplThreadTaskRunner() const {
 }
 
 bool Proxy::IsMainThread() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   if (impl_thread_is_overridden_)
     return false;
 
@@ -36,7 +36,7 @@ bool Proxy::IsMainThread() const {
 }
 
 bool Proxy::IsImplThread() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   if (impl_thread_is_overridden_)
     return true;
   if (!impl_task_runner_.get())
@@ -47,21 +47,21 @@ bool Proxy::IsImplThread() const {
 #endif
 }
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 void Proxy::SetCurrentThreadIsImplThread(bool is_impl_thread) {
   impl_thread_is_overridden_ = is_impl_thread;
 }
 #endif
 
 bool Proxy::IsMainThreadBlocked() const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   return is_main_thread_blocked_;
 #else
   return true;
 #endif
 }
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 void Proxy::SetMainThreadBlocked(bool is_main_thread_blocked) {
   is_main_thread_blocked_ = is_main_thread_blocked;
 }
@@ -69,7 +69,7 @@ void Proxy::SetMainThreadBlocked(bool is_main_thread_blocked) {
 
 Proxy::Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
              scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner)
-#if !DCHECK_IS_ON
+#if !DCHECK_IS_ON()
     : main_task_runner_(main_task_runner),
       impl_task_runner_(impl_task_runner),
       blocking_main_thread_task_runner_(