Update from https://crrev.com/311076

cc/resources/prioritized_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_PRIORITIZED_RESOURCE_H_
 #define CC_RESOURCES_PRIORITIZED_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 124 matching lines @@
     int priority_at_last_priority_update_;
     bool was_above_priority_cutoff_at_last_priority_update_;
 
     // Set if this is currently-drawing impl tree.
     bool in_drawing_impl_tree_;
     // Set if this is in the parent compositor.
     bool in_parent_compositor_;
 
     bool resource_has_been_deleted_;
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
     ResourceProvider* resource_provider_;
 #endif
     DISALLOW_COPY_AND_ASSIGN(Backing);
   };
 
   PrioritizedResource(PrioritizedResourceManager* resource_manager,
                       const gfx::Size& size,
                       ResourceFormat format);
 
   bool is_above_priority_cutoff() { return is_above_priority_cutoff_; }
@@ skipping 19 matching lines @@
 
   Backing* backing_;
   PrioritizedResourceManager* manager_;
 
   DISALLOW_COPY_AND_ASSIGN(PrioritizedResource);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PRIORITIZED_RESOURCE_H_