Update from https://crrev.com/311076

cc/resources/prioritized_resource_manager.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_manager.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/resources/prioritized_resource.h"
@@ skipping 463 matching lines @@
   // we can delete the resource while the main thread is running, but we cannot
   // unlink backings while the main thread is running.
   backing->DeleteResource(resource_provider);
   memory_use_bytes_ -= backing->bytes();
   backings_.pop_front();
   base::AutoLock scoped_lock(evicted_backings_lock_);
   evicted_backings_.push_back(backing);
 }
 
 void PrioritizedResourceManager::AssertInvariants() {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   DCHECK(proxy_->IsImplThread() && proxy_->IsMainThreadBlocked());
 
   // If we hit any of these asserts, there is a bug in this class. To see
   // where the bug is, call this function at the beginning and end of
   // every public function.
 
   // Backings/textures must be doubly-linked and only to other backings/textures
   // in this manager.
   for (BackingList::iterator it = backings_.begin(); it != backings_.end();
        ++it) {
@@ skipping 38 matching lines @@
          !backing->was_above_priority_cutoff_at_last_priority_update()))
       DCHECK(CompareBackings(previous_backing, backing));
     if (!backing->CanBeRecycledIfNotInExternalUse())
       reached_unrecyclable = true;
     if (reached_unrecyclable)
       DCHECK(!backing->CanBeRecycledIfNotInExternalUse());
     else
       DCHECK(backing->CanBeRecycledIfNotInExternalUse());
     previous_backing = backing;
   }
-#endif  // DCHECK_IS_ON
+#endif  // DCHECK_IS_ON()
 }
 
 const Proxy* PrioritizedResourceManager::ProxyForDebug() const {
   return proxy_;
 }
 
 }  // namespace cc