Reland: Move TouchSelectionController from content to ui

ui/touch_selection/touch_selection_controller_unittest.cc

 // Copyright 2014 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 "content/browser/renderer_host/input/touch_selection_controller.h"
+#include "ui/touch_selection/touch_selection_controller.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 using ui::test::MockMotionEvent;
 
-namespace content {
+namespace ui {
 namespace {
 
 const int kDefaultTapTimeoutMs = 200;
 const float kDefaulTapSlop = 10.f;
 
 class MockTouchHandleDrawable : public TouchHandleDrawable {
  public:
   explicit MockTouchHandleDrawable(bool* contains_point)
       : intersects_rect_(contains_point) {}
   ~MockTouchHandleDrawable() override {}
@@ skipping 68 matching lines @@
 
   scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
   void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
   void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
 
   void ClearSelection() {
-    controller_->OnSelectionBoundsChanged(cc::ViewportSelectionBound(),
-                                          cc::ViewportSelectionBound());
+    controller_->OnSelectionBoundsChanged(SelectionBound(),
+                                          SelectionBound());
   }
 
   void ClearInsertion() { ClearSelection(); }
 
   void ChangeInsertion(const gfx::RectF& rect, bool visible) {
-    cc::ViewportSelectionBound bound;
-    bound.type = cc::SELECTION_BOUND_CENTER;
-    bound.edge_top = rect.origin();
-    bound.edge_bottom = rect.bottom_left();
-    bound.visible = visible;
+    SelectionBound bound;
+    bound.set_type(SelectionBound::CENTER);
+    bound.SetEdge(rect.origin(), rect.bottom_left());
+    bound.set_visible(visible);
     controller_->OnSelectionBoundsChanged(bound, bound);
   }
 
   void ChangeSelection(const gfx::RectF& start_rect,
                        bool start_visible,
                        const gfx::RectF& end_rect,
                        bool end_visible) {
-    cc::ViewportSelectionBound start_bound, end_bound;
-    start_bound.type = cc::SELECTION_BOUND_LEFT;
-    end_bound.type = cc::SELECTION_BOUND_RIGHT;
-    start_bound.edge_top = start_rect.origin();
-    start_bound.edge_bottom = start_rect.bottom_left();
-    end_bound.edge_top = end_rect.origin();
-    end_bound.edge_bottom = end_rect.bottom_left();
-    start_bound.visible = start_visible;
-    end_bound.visible = end_visible;
+    SelectionBound start_bound, end_bound;
+    start_bound.set_type(SelectionBound::LEFT);
+    end_bound.set_type(SelectionBound::RIGHT);
+    start_bound.SetEdge(start_rect.origin(), start_rect.bottom_left());
+    end_bound.SetEdge(end_rect.origin(), end_rect.bottom_left());
+    start_bound.set_visible(start_visible);
+    end_bound.set_visible(end_visible);
     controller_->OnSelectionBoundsChanged(start_bound, end_bound);
   }
 
   void Animate() {
     base::TimeTicks now = base::TimeTicks::Now();
     while (needs_animate_) {
       needs_animate_ = controller_->Animate(now);
       now += base::TimeDelta::FromMilliseconds(16);
     }
   }
@@ skipping 696 matching lines @@
   controller().OnSelectionEditable(true);
   controller().OnSelectionEmpty(false);
   controller().HideAndDisallowShowingAutomatically();
   gfx::RectF insertion_rect(5, 5, 0, 10);
   ChangeInsertion(insertion_rect, visible);
   controller().AllowShowingFromCurrentSelection();
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 }
 
-}  // namespace content
+}  // namespace ui