Update from https://crrev.com/311076

cc/resources/scoped_resource.h

 // Copyright 2012 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_RESOURCES_SCOPED_RESOURCE_H_
 #define CC_RESOURCES_SCOPED_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/resource.h"
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 #include "base/threading/platform_thread.h"
 #endif
 
 namespace cc {
 
 class CC_EXPORT ScopedResource : public Resource {
  public:
   static scoped_ptr<ScopedResource> Create(
       ResourceProvider* resource_provider) {
     return make_scoped_ptr(new ScopedResource(resource_provider));
   }
   virtual ~ScopedResource();
 
   void Allocate(const gfx::Size& size,
                 ResourceProvider::TextureHint hint,
                 ResourceFormat format);
   void AllocateManaged(const gfx::Size& size,
                        GLenum target,
                        ResourceFormat format);
   void Free();
 
  protected:
   explicit ScopedResource(ResourceProvider* provider);
 
  private:
   ResourceProvider* resource_provider_;
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   base::PlatformThreadId allocate_thread_id_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ScopedResource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_SCOPED_RESOURCE_H_