Update from https://crrev.com/311076

cc/resources/picture_layer_tiling.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/picture_layer_tiling.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <set>
@@ skipping 177 matching lines @@
 
   // Create any missing tiles from the |twin_tiling|.
   for (const auto& tile_map_pair : twin_tiling.tiles_) {
     TileMapKey key = tile_map_pair.first;
     Tile* tile = tile_map_pair.second.get();
     if (!tile->is_shared())
       CreateTile(key.first, key.second, &twin_tiling, null_recycled_twin);
   }
 
   DCHECK_EQ(twin_tiling.tiles_.size(), tiles_.size());
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   for (const auto& tile_map_pair : tiles_)
     DCHECK(tile_map_pair.second->is_shared());
   VerifyLiveTilesRect(false);
 #endif
 
   UpdateTilePriorityRects(twin_tiling.current_content_to_screen_scale_,
                           twin_tiling.current_visible_rect_,
                           twin_tiling.current_skewport_rect_,
                           twin_tiling.current_soon_border_rect_,
                           twin_tiling.current_eventually_rect_,
@@ skipping 467 matching lines @@
 
   live_tiles_rect_ = new_live_tiles_rect;
   VerifyLiveTilesRect(false);
   if (recycled_twin) {
     recycled_twin->live_tiles_rect_ = live_tiles_rect_;
     recycled_twin->VerifyLiveTilesRect(true);
   }
 }
 
 void PictureLayerTiling::VerifyLiveTilesRect(bool is_on_recycle_tree) const {
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   for (auto it = tiles_.begin(); it != tiles_.end(); ++it) {
     if (!it->second.get())
       continue;
     DCHECK(it->first.first < tiling_data_.num_tiles_x())
         << this << " " << it->first.first << "," << it->first.second
         << " num_tiles_x " << tiling_data_.num_tiles_x() << " live_tiles_rect "
         << live_tiles_rect_.ToString();
     DCHECK(it->first.second < tiling_data_.num_tiles_y())
         << this << " " << it->first.first << "," << it->first.second
         << " num_tiles_y " << tiling_data_.num_tiles_y() << " live_tiles_rect "
@@ skipping 331 matching lines @@
       break;
   }
 
   gfx::Rect result(origin_x, origin_y, width, height);
   if (cache)
     cache->previous_result = result;
   return result;
 }
 
 }  // namespace cc