cc cleanup: Update paths to geometry headers

Geometry headers were moved from /ui/gfx/ to ui/gfx/geometry.
Updating includes accordingly.

BUG=395370

Review URL: https://codereview.chromium.org/660333004

Cr-Commit-Position: refs/heads/master@{#300902}

9 files changed, 20 insertions, 20 deletions

diff --git a/cc/base/float_quad_unittest.cc b/cc/base/float_quad_unittest.cc
index c2186fd81..6d9ce02 100644
--- a/cc/base/float_quad_unittest.cc
+++ b/cc/base/float_quad_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "cc/base/math_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/quad_f.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/quad_f.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
diff --git a/cc/base/invalidation_region.h b/cc/base/invalidation_region.h
index 9cb2fe3..7aa4a8b 100644
--- a/cc/base/invalidation_region.h
+++ b/cc/base/invalidation_region.h
@@ -7,7 +7,7 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
diff --git a/cc/base/math_util.cc b/cc/base/math_util.cc
index 8cd0692..816f6fc 100644
--- a/cc/base/math_util.cc
+++ b/cc/base/math_util.cc
@@ -10,12 +10,12 @@
 
 #include "base/debug/trace_event_argument.h"
 #include "base/values.h"
-#include "ui/gfx/quad_f.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/rect_conversions.h"
-#include "ui/gfx/rect_f.h"
+#include "ui/gfx/geometry/quad_f.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/rect_f.h"
+#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/transform.h"
-#include "ui/gfx/vector2d_f.h"
 
 namespace cc {
 
diff --git a/cc/base/math_util.h b/cc/base/math_util.h
index 622ea4d..50494e1 100644
--- a/cc/base/math_util.h
+++ b/cc/base/math_util.h
@@ -12,11 +12,11 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
-#include "ui/gfx/box_f.h"
+#include "ui/gfx/geometry/box_f.h"
+#include "ui/gfx/geometry/point3_f.h"
+#include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/scroll_offset.h"
-#include "ui/gfx/point3_f.h"
-#include "ui/gfx/point_f.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace base {
diff --git a/cc/base/math_util_unittest.cc b/cc/base/math_util_unittest.cc
index fb8c27f..325870d 100644
--- a/cc/base/math_util_unittest.cc
+++ b/cc/base/math_util_unittest.cc
@@ -9,8 +9,8 @@
 #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 {
diff --git a/cc/base/region.h b/cc/base/region.h
index d78d4cb..294ea63 100644
--- a/cc/base/region.h
+++ b/cc/base/region.h
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "third_party/skia/include/core/SkRegion.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skia_util.h"
 
 namespace base {
diff --git a/cc/base/simple_enclosed_region.h b/cc/base/simple_enclosed_region.h
index c9625ba..5e8a6b2 100644
--- a/cc/base/simple_enclosed_region.h
+++ b/cc/base/simple_enclosed_region.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "cc/base/cc_export.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
diff --git a/cc/base/tiling_data.cc b/cc/base/tiling_data.cc
index 61bb851..7b39878 100644
--- a/cc/base/tiling_data.cc
+++ b/cc/base/tiling_data.cc
@@ -6,8 +6,8 @@
 
 #include <algorithm>
 
-#include "ui/gfx/rect.h"
-#include "ui/gfx/vector2d.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/vector2d.h"
 
 namespace cc {
 
diff --git a/cc/base/tiling_data.h b/cc/base/tiling_data.h
index 08d421c..5e8a4d6 100644
--- a/cc/base/tiling_data.h
+++ b/cc/base/tiling_data.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "cc/base/cc_export.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace gfx {
 class Vector2d;