Update from https://crrev.com/311076

cc/trees/proxy.h

Index: cc/trees/proxy.h
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
index e07e9a213599bc9df14fb56547a18a15c58d2af9..206af66d7edff08522d3d35d89732a71eca6b35a 100644
--- a/cc/trees/proxy.h
+++ b/cc/trees/proxy.h
@@ -46,7 +46,7 @@ class CC_EXPORT Proxy {
   bool IsMainThread() const;
   bool IsImplThread() const;
   bool IsMainThreadBlocked() const;
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   void SetMainThreadBlocked(bool is_main_thread_blocked);
   void SetCurrentThreadIsImplThread(bool is_impl_thread);
 #endif
@@ -127,7 +127,7 @@ class CC_EXPORT Proxy {
   scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
   scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_;
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   const base::PlatformThreadId main_thread_id_;
   bool impl_thread_is_overridden_;
   bool is_main_thread_blocked_;
@@ -136,7 +136,7 @@ class CC_EXPORT Proxy {
   DISALLOW_COPY_AND_ASSIGN(Proxy);
 };
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 class DebugScopedSetMainThreadBlocked {
  public:
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) : proxy_(proxy) {