Update from https://crrev.com/311076

cc/layers/delegated_frame_provider.cc

 // Copyright 2013 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/layers/delegated_frame_provider.h"
 
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ skipping 10 matching lines @@
   SetFrameData(frame.Pass());
 }
 
 DelegatedFrameProvider::~DelegatedFrameProvider() {
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(frame_->resource_list, &returned);
   resource_collection_->UnrefResources(returned);
 }
 
 void DelegatedFrameProvider::AddObserver(DelegatedRendererLayer* layer) {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   for (size_t i = 0; i < observers_.size(); ++i)
     DCHECK(observers_[i].layer != layer);
 #endif
 
   observers_.push_back(Observer(layer, gfx::RectF(frame_size_)));
 
   DCHECK(frame_) << "Must have a frame when given to a DelegatedRendererLayer.";
 }
 
 void DelegatedFrameProvider::RemoveObserver(DelegatedRendererLayer* layer) {
@@ skipping 59 matching lines @@
 DelegatedFrameProvider::GetReturnResourcesCallbackForImplThread() {
   return resource_collection_->GetReturnResourcesCallbackForImplThread();
 }
 
 void DelegatedFrameProvider::UnrefResourcesOnMainThread(
     const ReturnedResourceArray& returned) {
   resource_collection_->UnrefResources(returned);
 }
 
 }  // namespace cc