Use gfx::ToRoundedInt instead of cc::MathUtil::Round

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/base/math_util.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"
 
 namespace ui {
 
 float GetDeviceScaleFactor(const Layer* layer) {
@@ skipping 66 matching lines @@
   DCHECK(snapped_layer);
   DCHECK(snapped_layer->Contains(layer_to_snap));
 
   gfx::Point view_offset_dips = layer_to_snap->GetTargetBounds().origin();
   ui::Layer::ConvertPointToLayer(
       layer_to_snap->parent(), snapped_layer, &view_offset_dips);
   gfx::PointF view_offset = view_offset_dips;
 
   float scale_factor = GetDeviceScaleFactor(layer_to_snap);
   view_offset.Scale(scale_factor);
-  gfx::PointF view_offset_snapped(cc::MathUtil::Round(view_offset.x()),
-                                  cc::MathUtil::Round(view_offset.y()));
+  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 !defined(NDEBUG)
   gfx::Point p;
   Layer::ConvertPointToLayer(layer_to_snap->parent(), snapped_layer, &p);
   cc::Layer* cc_layer = layer_to_snap->cc_layer();
   gfx::PointF origin = cc_layer->position();
   CheckSnapped((p.x() + origin.x()) * scale_factor);
   CheckSnapped((p.y() + origin.y()) * scale_factor);
 #endif
 }
 
 }  // namespace ui