Move SelectionBound from ui/base/touch to ui/gfx to be used by cc

ui/gfx/selection_bound_unittest.cc

Index: ui/gfx/selection_bound_unittest.cc
diff --git a/ui/base/touch/selection_bound_unittest.cc b/ui/gfx/selection_bound_unittest.cc
similarity index 62%
rename from ui/base/touch/selection_bound_unittest.cc
rename to ui/gfx/selection_bound_unittest.cc
index 95ba5fbc3f2ac47952177e05993050c6ea33022e..8feebc4d73def12aea465b2c615eb69da56da2e1 100644
--- a/ui/base/touch/selection_bound_unittest.cc
+++ b/ui/gfx/selection_bound_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/touch/selection_bound.h"
+#include "ui/gfx/selection_bound.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace ui {
+namespace gfx {
 
 TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
   SelectionBound b1, b2;
@@ -15,8 +15,7 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
   b1.SetEdge(gfx::PointF(0.f, 20.f), gfx::PointF(0.f, 25.f));
   b2.SetEdge(gfx::PointF(110.f, 20.f), gfx::PointF(110.f, 25.f));
   gfx::Rect expected_rect(
-      b1.edge_top_rounded().x(),
-      b1.edge_top_rounded().y(),
+      b1.edge_top_rounded().x(), b1.edge_top_rounded().y(),
       b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
       b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
@@ -25,66 +24,59 @@ TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
   // Parallel vertical bounds of different heights
   b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 25.f));
   b2.SetEdge(gfx::PointF(110.f, 0.f), gfx::PointF(110.f, 35.f));
-  expected_rect = gfx::Rect(
-      b1.edge_top_rounded().x(),
-      b2.edge_top_rounded().y(),
-      b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
-      b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_top_rounded().x(), b2.edge_top_rounded().y(),
+                b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+                b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 
   b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
   b2.SetEdge(gfx::PointF(110.f, 25.f), gfx::PointF(110.f, 45.f));
-  expected_rect = gfx::Rect(
-      b1.edge_top_rounded().x(),
-      b1.edge_top_rounded().y(),
-      b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
-      b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_top_rounded().x(), b1.edge_top_rounded().y(),
+                b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+                b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 
   b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
   b2.SetEdge(gfx::PointF(110.f, 40.f), gfx::PointF(110.f, 60.f));
-  expected_rect = gfx::Rect(
-      b1.edge_top_rounded().x(),
-      b1.edge_top_rounded().y(),
-      b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
-      b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_top_rounded().x(), b1.edge_top_rounded().y(),
+                b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+                b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 
   // Overlapping vertical bounds
   b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(10.f, 30.f));
   b2.SetEdge(gfx::PointF(10.f, 25.f), gfx::PointF(10.f, 40.f));
-  expected_rect = gfx::Rect(
-      b1.edge_top_rounded().x(),
-      b1.edge_top_rounded().y(),
-      0,
-      b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_top_rounded().x(), b1.edge_top_rounded().y(), 0,
+                b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 
   // Non-vertical bounds: "\ \"
   b1.SetEdge(gfx::PointF(10.f, 20.f), gfx::PointF(20.f, 30.f));
   b2.SetEdge(gfx::PointF(110.f, 40.f), gfx::PointF(120.f, 60.f));
-  expected_rect = gfx::Rect(
-      b1.edge_top_rounded().x(),
-      b1.edge_top_rounded().y(),
-      b2.edge_bottom_rounded().x() - b1.edge_top_rounded().x(),
-      b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_top_rounded().x(), b1.edge_top_rounded().y(),
+                b2.edge_bottom_rounded().x() - b1.edge_top_rounded().x(),
+                b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 
   // Non-vertical bounds: "/ \"
   b1.SetEdge(gfx::PointF(20.f, 30.f), gfx::PointF(0.f, 40.f));
   b2.SetEdge(gfx::PointF(110.f, 30.f), gfx::PointF(120.f, 40.f));
-  expected_rect = gfx::Rect(
-      b1.edge_bottom_rounded().x(),
-      b1.edge_top_rounded().y(),
-      b2.edge_bottom_rounded().x() - b1.edge_bottom_rounded().x(),
-      b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
+  expected_rect =
+      gfx::Rect(b1.edge_bottom_rounded().x(), b1.edge_top_rounded().y(),
+                b2.edge_bottom_rounded().x() - b1.edge_bottom_rounded().x(),
+                b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
   EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
 }
 
-}  // namespace ui
+}  // namespace gfx