Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

cc/base/math_util_unittest.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/base/math_util.h"
 
 #include <cmath>
 
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 TEST(MathUtilTest, ProjectionOfPerpendicularPlane) {
   // In this case, the m33() element of the transform becomes zero, which could
   // cause a divide-by-zero when projecting points/quads.
 
   gfx::Transform transform;
@@ skipping 164 matching lines @@
   transform = gfx::Transform();
   transform.ApplyPerspectiveDepth(10.0);
   transform.Translate3d(0.0, 0.0, 5.0);
   output =
       MathUtil::MapEnclosedRectWith2dAxisAlignedTransform(transform, input);
   EXPECT_EQ(gfx::Rect(2, 4, 6, 8), output);
 }
 
 }  // namespace
 }  // namespace cc