Reland: Move TouchSelectionController from content to ui

ui/views/touchui/touch_selection_controller_impl_unittest.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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/test_cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 28 matching lines @@
 const int kMenuButtonWidth = 63;
 
 // Should match size of kMenuCommands array in touch_editing_menu.
 const int kMenuCommandCount = 3;
 
 // For selection bounds |b1| and |b2| in a paragraph of text, returns -1 if |b1|
 // is physically before |b2|, +1 if |b2| is before |b1|, and 0 if they are at
 // the same location.
 int CompareTextSelectionBounds(const ui::SelectionBound& b1,
                                const ui::SelectionBound& b2) {
-  if ((b1.edge_top.y() < b2.edge_top.y()) || b1.edge_top.x() < b2.edge_top.x())
+  if (b1.edge_top().y() < b2.edge_top().y() ||
+      b1.edge_top().x() < b2.edge_top().x()) {
     return -1;
-  else if (b1 == b2)
+  }
+  if (b1 == b2)
     return 0;
-  else
-    return 1;
+  return 1;
 }
 
 }  // namespace
 
 namespace views {
 
 class TouchSelectionControllerImplTest : public ViewsTestBase {
  public:
   TouchSelectionControllerImplTest()
       : textfield_widget_(nullptr),
@@ skipping 186 matching lines @@
     } else {
       EXPECT_FALSE(IsSelectionHandle1Visible()) << from_str;
       EXPECT_FALSE(IsSelectionHandle2Visible()) << from_str;
       EXPECT_TRUE(IsCursorHandleVisible());
       gfx::Rect cursor_bounds = GetCursorHandleBounds();
       DCHECK(anchor == focus);
       EXPECT_EQ(cursor_bounds, GetExpectedHandleBounds(anchor)) << from_str;
     }
     if (check_direction)  {
       if (CompareTextSelectionBounds(anchor, focus) < 0) {
-        EXPECT_EQ(ui::SelectionBound::LEFT, anchor.type) << from_str;
-        EXPECT_EQ(ui::SelectionBound::RIGHT, focus.type)  << from_str;
+        EXPECT_EQ(ui::SelectionBound::LEFT, anchor.type()) << from_str;
+        EXPECT_EQ(ui::SelectionBound::RIGHT, focus.type())  << from_str;
       } else if (CompareTextSelectionBounds(anchor, focus) > 0) {
-        EXPECT_EQ(ui::SelectionBound::LEFT, focus.type)  << from_str;
-        EXPECT_EQ(ui::SelectionBound::RIGHT, anchor.type)  << from_str;
+        EXPECT_EQ(ui::SelectionBound::LEFT, focus.type())  << from_str;
+        EXPECT_EQ(ui::SelectionBound::RIGHT, anchor.type())  << from_str;
       } else {
-        EXPECT_EQ(ui::SelectionBound::CENTER, focus.type) << from_str;
-        EXPECT_EQ(ui::SelectionBound::CENTER, anchor.type) << from_str;
+        EXPECT_EQ(ui::SelectionBound::CENTER, focus.type()) << from_str;
+        EXPECT_EQ(ui::SelectionBound::CENTER, anchor.type()) << from_str;
       }
     }
   }
 
   Widget* textfield_widget_;
   Widget* widget_;
 
   Textfield* textfield_;
   scoped_ptr<TextfieldTestApi> textfield_test_api_;
   scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
@@ skipping 327 matching lines @@
   explicit TestTouchEditable(aura::Window* window)
       : window_(window) {
     DCHECK(window);
   }
 
   void set_bounds(const gfx::Rect& bounds) {
     bounds_ = bounds;
   }
 
   void set_cursor_rect(const gfx::Rect& cursor_rect) {
-    cursor_bound_.edge_top = cursor_rect.origin();
-    cursor_bound_.edge_bottom = cursor_rect.bottom_left();
-    cursor_bound_.type = ui::SelectionBound::Type::CENTER;
+    cursor_bound_.SetEdge(cursor_rect.origin(), cursor_rect.bottom_left());
+    cursor_bound_.set_type(ui::SelectionBound::Type::CENTER);
   }
 
   ~TestTouchEditable() override {}
 
  private:
   // Overridden from ui::TouchEditable.
   void SelectRect(const gfx::Point& start, const gfx::Point& end) override {
     NOTREACHED();
   }
   void MoveCaretTo(const gfx::Point& point) override { NOTREACHED(); }
@@ skipping 248 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views