Update from https://crrev.com/311076

cc/resources/prioritized_resource.cc

 // 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.
 
 #include "cc/resources/prioritized_resource.h"
 
 #include <algorithm>
 
 #include "cc/resources/platform_color.h"
 #include "cc/resources/prioritized_resource_manager.h"
@@ skipping 108 matching lines @@
 PrioritizedResource::Backing::Backing(unsigned id,
                                       ResourceProvider* resource_provider,
                                       const gfx::Size& size,
                                       ResourceFormat format)
     : Resource(id, size, format),
       owner_(NULL),
       priority_at_last_priority_update_(PriorityCalculator::LowestPriority()),
       was_above_priority_cutoff_at_last_priority_update_(false),
       in_drawing_impl_tree_(false),
       in_parent_compositor_(false),
-#if !DCHECK_IS_ON
+#if !DCHECK_IS_ON()
       resource_has_been_deleted_(false) {
 #else
       resource_has_been_deleted_(false),
       resource_provider_(resource_provider) {
 #endif
 }
 
 PrioritizedResource::Backing::~Backing() {
   DCHECK(!owner_);
   DCHECK(resource_has_been_deleted_);
 }
 
 void PrioritizedResource::Backing::DeleteResource(
     ResourceProvider* resource_provider) {
   DCHECK(!proxy() || proxy()->IsImplThread());
   DCHECK(!resource_has_been_deleted_);
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(resource_provider == resource_provider_);
 #endif
 
   resource_provider->DeleteResource(id());
   set_id(0);
   resource_has_been_deleted_ = true;
 }
 
 bool PrioritizedResource::Backing::ResourceHasBeenDeleted() const {
   DCHECK(!proxy() || proxy()->IsImplThread());
@@ skipping 37 matching lines @@
     manager_->ReturnBackingTexture(this);
 }
 
 const Proxy* PrioritizedResource::Backing::proxy() const {
   if (!owner_ || !owner_->resource_manager())
     return NULL;
   return owner_->resource_manager()->ProxyForDebug();
 }
 
 }  // namespace cc