Update from https://crrev.com/311076

ui/compositor/dip_util.cc

 // Copyright (c) 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 "ui/compositor/dip_util.h"
 
 #include "base/command_line.h"
 #include "cc/layers/layer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/size_conversions.h"
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 #include "ui/compositor/layer_animator.h"
 #endif
 
 namespace ui {
 
 float GetDeviceScaleFactor(const Layer* layer) {
   return layer->device_scale_factor();
 }
 
 gfx::Point ConvertPointToDIP(const Layer* layer,
@@ skipping 37 matching lines @@
   // Use ToEnclosingRect() to ensure we paint all the possible pixels
   // touched. ToEnclosingRect() floors the origin, and ceils the max
   // coordinate. To do otherwise (such as flooring the size) potentially
   // results in rounding down and not drawing all the pixels that are
   // touched.
   return gfx::ToEnclosingRect(
       gfx::RectF(gfx::ScalePoint(rect_in_dip.origin(), scale),
                  gfx::ScaleSize(rect_in_dip.size(), scale)));
 }
 
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
 namespace {
 
 void CheckSnapped(float snapped_position) {
   const float kEplison = 0.0001f;
   float diff = std::abs(snapped_position - gfx::ToRoundedInt(snapped_position));
   DCHECK_LT(diff, kEplison);
 }
 
 }  // namespace
 #endif
@@ skipping 10 matching lines @@
   gfx::PointF view_offset = view_offset_dips;
 
   float scale_factor = GetDeviceScaleFactor(layer_to_snap);
   view_offset.Scale(scale_factor);
   gfx::PointF view_offset_snapped(gfx::ToRoundedInt(view_offset.x()),
                                   gfx::ToRoundedInt(view_offset.y()));
 
   gfx::Vector2dF fudge = view_offset_snapped - view_offset;
   fudge.Scale(1.0 / scale_factor);
   layer_to_snap->SetSubpixelPositionOffset(fudge);
-#if DCHECK_IS_ON
+#if DCHECK_IS_ON()
   gfx::Point layer_offset;
   gfx::PointF origin;
   Layer::ConvertPointToLayer(
       layer_to_snap->parent(), snapped_layer, &layer_offset);
   if (layer_to_snap->GetAnimator()->is_animating()) {
     origin = layer_to_snap->GetTargetBounds().origin() +
              layer_to_snap->subpixel_position_offset();
   } else {
     cc::Layer* cc_layer = layer_to_snap->cc_layer();
     origin = cc_layer->position();
   }
   CheckSnapped((layer_offset.x() + origin.x()) * scale_factor);
   CheckSnapped((layer_offset.y() + origin.y()) * scale_factor);
 #endif
 }
 
 }  // namespace ui