MacViews: Fix some TableView tests, add ui::EventGenerator::set_assume_window_at_origin(bool)

ui/views/controls/table/table_view_unittest.cc

Index: ui/views/controls/table/table_view_unittest.cc
diff --git a/ui/views/controls/table/table_view_unittest.cc b/ui/views/controls/table/table_view_unittest.cc
index 8c82fb7b462786f6071f8d02dd165a842dd39ed2..3515ebb3db14ba851bed52d6d4586e0110a956ad 100644
--- a/ui/views/controls/table/table_view_unittest.cc
+++ b/ui/views/controls/table/table_view_unittest.cc
@@ -51,6 +51,12 @@ class TableViewTestHelper {
 
 namespace {
 
+#if defined(OS_MACOSX)
+constexpr int kCtrlOrCmdMask = ui::EF_COMMAND_DOWN;
+#else
+constexpr int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN;
+#endif
+
 // TestTableModel2 -------------------------------------------------------------
 
 // Trivial TableModel implementation that is backed by a vector of vectors.
@@ -204,8 +210,7 @@ class TableViewTest : public ViewsTestBase {
     parent->Layout();
     helper_.reset(new TableViewTestHelper(table_));
 
-    Widget::InitParams params =
-        CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 650, 650);
     widget_.reset(new Widget);
@@ -221,6 +226,7 @@ class TableViewTest : public ViewsTestBase {
 
   void ClickOnRow(int row, int flags) {
     ui::test::EventGenerator generator(widget_->GetNativeWindow());
+    generator.set_assume_window_at_origin(false);
     generator.set_flags(flags);
     generator.set_current_location(GetPointForRow(row));
     generator.PressLeftButton();
@@ -953,12 +959,12 @@ TEST_F(TableViewTest, Multiselection) {
   EXPECT_EQ("active=2 anchor=4 selection=2 3 4", SelectionStateAsString());
 
   // Control click on third row, should toggle it.
-  ClickOnRow(2, ui::EF_CONTROL_DOWN);
+  ClickOnRow(2, kCtrlOrCmdMask);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=2 anchor=2 selection=3 4", SelectionStateAsString());
 
   // Control-shift click on second row, should extend selection to it.
-  ClickOnRow(1, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
+  ClickOnRow(1, kCtrlOrCmdMask | ui::EF_SHIFT_DOWN);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=1 anchor=2 selection=0 1 2 3 4", SelectionStateAsString());