MacViews: Merge single-character edits, map (and validate) undo and redo

ui/views/controls/textfield/textfield_unittest.cc

Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index e5ddf39b7593f4fb96c6dde5352fe83cc1dbe07c..f0d80b046d24442afcda5f4c6c5d2e7b0559bd86 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -376,6 +376,16 @@ class TextfieldTest : public ViewsTestBase, public TextfieldController {
       SendKeyEvent(ui::VKEY_INSERT, true, false);
   }
 
+  // Most platforms support Ctrl+Y as an alternative to Ctrl+Shift+Z, but on Mac

[msw, 2015/02/18 19:10:42]

nit: CTRL+SHIFT+Z works on windows and linux. Maybe we should use CTRL+SHIFT+Z
in most of the tests below, and just have one test [case] of the alternate key
combo for those platforms that support CTRL+Y.

[tapted, 2015/02/19 03:19:10]

Done.

+  // that is bound to "Show full history", so is not mapped as an editing
+  // command. So, on Mac, send Cmd+Shift+Z.
+  void SendAlternateRedo() {
+    if (TestingNativeMac())
+      SendKeyEvent(ui::VKEY_Z, true, true);
+    else
+      SendKeyEvent(ui::VKEY_Y, false, true);
+  }
+
   View* GetFocusedView() {
     return widget_->GetFocusManager()->GetFocusedView();
   }
@@ -1075,11 +1085,11 @@ TEST_F(TextfieldTest, DragAndDrop_ToTheRight) {
   EXPECT_STR_EQ("", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("h welloorld", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("h welloorld", textfield_->text());
 }
 
@@ -1128,11 +1138,11 @@ TEST_F(TextfieldTest, DragAndDrop_ToTheLeft) {
   EXPECT_STR_EQ("", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("hello world", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("h worlellod", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("h worlellod", textfield_->text());
 }
 
@@ -1349,9 +1359,9 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("a", textfield_->text());
 
   // AppendText
@@ -1360,7 +1370,7 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("ab", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("ab", textfield_->text());
 
   // SetText
@@ -1372,9 +1382,9 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("abc", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("abc", textfield_->text());
   textfield_->SetText(ASCIIToUTF16("123"));
   textfield_->SetText(ASCIIToUTF16("123"));
@@ -1391,11 +1401,11 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("ab", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("a", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("123", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("1234", textfield_->text());
 
   // Undoing to the same text shouldn't call ContentsChanged.
@@ -1407,13 +1417,14 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("abc", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("1234", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("abc", textfield_->text());
 
   // Delete/Backspace
   SendKeyEvent(ui::VKEY_BACK);
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_HOME);
+  bool shift = false;
+  SendHomeEvent(shift);
   SendKeyEvent(ui::VKEY_DELETE);
   EXPECT_STR_EQ("b", textfield_->text());
   SendKeyEvent(ui::VKEY_A, false, true);
@@ -1425,13 +1436,13 @@ TEST_F(TextfieldTest, UndoRedoTest) {
   EXPECT_STR_EQ("ab", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("abc", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("ab", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("b", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("", textfield_->text());
-  SendKeyEvent(ui::VKEY_Y, false, true);
+  SendAlternateRedo();
   EXPECT_STR_EQ("", textfield_->text());
 }