Update from https://crrev.com/311076

cc/trees/proxy.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TREES_PROXY_H_
 #define CC_TREES_PROXY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 28 matching lines @@
 class CC_EXPORT Proxy {
  public:
   base::SingleThreadTaskRunner* MainThreadTaskRunner() const;
   bool HasImplThread() const;
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() const;
 
   // Debug hooks.
   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
 
   virtual ~Proxy();
 
   virtual void FinishAllRendering() = 0;
 
   virtual bool IsStarted() const = 0;
 
@@ skipping 60 matching lines @@
         scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
   friend class DebugScopedSetImplThread;
   friend class DebugScopedSetMainThread;
   friend class DebugScopedSetMainThreadBlocked;
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   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_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Proxy);
 };
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 class DebugScopedSetMainThreadBlocked {
  public:
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) : proxy_(proxy) {
     DCHECK(!proxy_->IsMainThreadBlocked());
     proxy_->SetMainThreadBlocked(true);
   }
   ~DebugScopedSetMainThreadBlocked() {
     DCHECK(proxy_->IsMainThreadBlocked());
     proxy_->SetMainThreadBlocked(false);
   }
  private:
   Proxy* proxy_;
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked);
 };
 #else
 class DebugScopedSetMainThreadBlocked {
  public:
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {}
   ~DebugScopedSetMainThreadBlocked() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked);
 };
 #endif
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_H_