Port autocomplete_edit_view_browsertest.cc to Mac.

chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc

 // Copyright (c) 2011 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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/events/event.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "views/controls/textfield/native_textfield_views.h"
+#include "views/events/event.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 const char kSearchKeyword[] = "foo";
 const wchar_t kSearchKeywordKeys[] = {
   ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0
@@ skipping 111 matching lines @@
   }
 
   void GetAutocompleteEditView(AutocompleteEditView** edit_view) {
     GetAutocompleteEditViewForBrowser(browser(), edit_view);
   }
 
   static void SendKeyForBrowser(const Browser* browser,
                                 ui::KeyboardCode key,
                                 bool control,
                                 bool shift,
-                                bool alt) {
+                                bool alt,
+                                bool command) {
     ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
-        browser, key, control, shift, alt, false /* command */));
+        browser, key, control, shift, alt, command));
   }
 
-  void SendKey(ui::KeyboardCode key, bool control, bool shift, bool alt) {
-    SendKeyForBrowser(browser(), key, control, shift, alt);
+  void SendKey(ui::KeyboardCode key,
+               bool control,
+               bool shift,
+               bool alt,
+               bool command) {
+    SendKeyForBrowser(browser(), key, control, shift, alt, command);
   }
 
   void SendKeySequence(const wchar_t* keys) {
     for (; *keys; ++keys)
       ASSERT_NO_FATAL_FAILURE(SendKey(static_cast<ui::KeyboardCode>(*keys),
-                                      false, false, false));
+                                      false, false, false, false));
   }
 
   void WaitForTabOpenOrCloseForBrowser(const Browser* browser,
                                        int expected_tab_count) {
     int tab_count = browser->tab_count();
     if (tab_count == expected_tab_count)
       return;
 
     NotificationRegistrar registrar;
     registrar.Add(this,
@@ skipping 142 matching lines @@
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     int tab_count = browser()->tab_count();
 
     // Create a new Tab.
     browser()->NewTab();
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
 
     // Select the first Tab.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_1, true, false, false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_1, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_1, true, false, false, false));
+#endif
     ASSERT_EQ(0, browser()->selected_index());
 
     browser()->FocusLocationBar();
 
     // Select the second Tab.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, true, false, false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_2, true, false, false, false));
+#endif
     ASSERT_EQ(1, browser()->selected_index());
 
     browser()->FocusLocationBar();
 
     // Try ctrl-w to close a Tab.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_W, true, false, false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_W, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_W, true, false, false, false));
+#endif
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count));
 
     // Try ctrl-l to focus location bar.
     edit_view->SetUserText(ASCIIToUTF16("Hello world"));
     EXPECT_FALSE(edit_view->IsSelectAll());
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_L, true, false, false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_L, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_L, true, false, false, false));
+#endif
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Try editing the location bar text.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_RIGHT, false, false, false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_S, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_S, false, false, false, false));
     EXPECT_EQ(ASCIIToUTF16("Hello worlds"), edit_view->GetText());
 
     // Try ctrl-x to cut text.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, true, true, false));
+#if defined(OS_MACOSX)
+    // Mac uses alt-left/right to select a word.
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, false, true, true, false));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, true, true, false, false));
+#endif
     EXPECT_FALSE(edit_view->IsSelectAll());
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_X, true, false, false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_X, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_X, true, false, false, false));
+#endif
     EXPECT_EQ(ASCIIToUTF16("Hello "), edit_view->GetText());
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
     // Try alt-f4 to close the browser.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         browser(), ui::VKEY_F4, false, false, true, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(browser())));
 #endif
   }
 
   void PopupAcceleratorsTest() {
     // Create a popup.
     Browser* popup = CreateBrowserForPopup(browser()->profile());
+    ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(popup));
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(
         GetAutocompleteEditViewForBrowser(popup, &edit_view));
     popup->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
 
+#if !defined(OS_MACOSX)
     // Try ctrl-w to close the popup.
+    // This piece of code doesn't work on Mac, because the Browser object won't
+    // be destroyed before finishing the current message loop iteration, thus
+    // No BROWSER_CLOSED notification will be sent.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         popup, ui::VKEY_W, true, false, false, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
 
     // Create another popup.
     popup = CreateBrowserForPopup(browser()->profile());
+    ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(popup));
     ASSERT_NO_FATAL_FAILURE(
         GetAutocompleteEditViewForBrowser(popup, &edit_view));
+#endif
 
     // Set the edit text to "Hello world".
     edit_view->SetUserText(ASCIIToUTF16("Hello world"));
+#if defined(OS_MACOSX)
+    EXPECT_TRUE(edit_view->IsSelectAll());
+#else
     EXPECT_FALSE(edit_view->IsSelectAll());
+#endif

[Scott Hess - ex-Googler, 2011/03/02 19:21:06]

Is this expect even reasonable?  It seems to be making an assertion about
implementation internals for something which you shouldn't rely on anyhow. 
Likewise for some of the following, which seem to assume that keyboard
operations which aren't allowed should sometimes change the selection on some
platforms.

[James Su, 2011/03/02 22:04:42]

Done.

     popup->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Try editing the location bar text -- should be disallowed.
-    ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_RIGHT, false,
-                                              false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_RIGHT, false, false, false, false));
+#if defined(OS_MACOSX)
+    EXPECT_TRUE(edit_view->IsSelectAll());
+#else
     EXPECT_FALSE(edit_view->IsSelectAll());
-    ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_S, false, false,
-                                              false));
+#endif
+
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_S, false, false, false, false));
     EXPECT_EQ(ASCIIToUTF16("Hello world"), edit_view->GetText());
 
     // Try ctrl-x to cut text -- should be disallowed.
-    ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_LEFT, true, true,
-                                              false));
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_LEFT, false, true, true, false));
+    EXPECT_TRUE(edit_view->IsSelectAll());
+#else
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_LEFT, true, true, false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
-    ASSERT_NO_FATAL_FAILURE(SendKeyForBrowser(popup, ui::VKEY_X, true, false,
-                                              false));
+#endif
+
+#if defined(OS_MACOSX)
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_X, false, false, false, true));
+#else
+    ASSERT_NO_FATAL_FAILURE(
+        SendKeyForBrowser(popup, ui::VKEY_X, true, false, false, false));
+#endif
     EXPECT_EQ(ASCIIToUTF16("Hello world"), edit_view->GetText());
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
     // Try alt-f4 to close the popup.
     ASSERT_TRUE(ui_test_utils::SendKeyPressAndWait(
         popup, ui::VKEY_F4, false, false, true, false,
         NotificationType::BROWSER_CLOSED, Source<Browser>(popup)));
 #endif
   }
 
   void BackspaceInKeywordModeTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Trigger keyword mode.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Backspace without search text should bring back keyword hint mode.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Trigger keyword mode again.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Should stay in keyword mode while deleting search text by pressing
     // backspace.
     for (size_t i = 0; i < arraysize(kSearchText) - 1; ++i) {
-      ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+      ASSERT_NO_FATAL_FAILURE(
+          SendKey(ui::VKEY_BACK, false, false, false, false));
       ASSERT_FALSE(edit_view->model()->is_keyword_hint());
       ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
     }
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Move cursor to the beginning of the search text.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, false, false, false));
     // Backspace at the beginning of the search text shall turn off
     // the keyword mode.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(string16(), edit_view->model()->keyword());
     ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
               UTF16ToUTF8(edit_view->GetText()));
   }
 
   void EscapeTest() {
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
     browser()->FocusLocationBar();
 
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     string16 old_text = edit_view->GetText();
     EXPECT_FALSE(old_text.empty());
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     // Delete all text in omnibox.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
     EXPECT_TRUE(edit_view->GetText().empty());
 
     // Escape shall revert the text in omnibox.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_ESCAPE, false, false, false, false));
     EXPECT_EQ(old_text, edit_view->GetText());
     EXPECT_TRUE(edit_view->IsSelectAll());
   }
 
   void DesiredTLDTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Test ctrl-Enter.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be
     // opened.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, true, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_RETURN, true, false, false, false));
 
     GURL url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());
   }
 
   void AltEnterTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     edit_view->SetUserText(ASCIIToUTF16(chrome::kChromeUIHistoryURL));
     int tab_count = browser()->tab_count();
     // alt-Enter opens a new tab.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, true));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_RETURN, false, false, true, false));
     ASSERT_NO_FATAL_FAILURE(WaitForTabOpenOrClose(tab_count + 1));
   }
 
   void EnterToSearchTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Test Enter to search.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     // Check if the default match result is Search Primary Provider.
     ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
               popup_model->result().default_match()->type);
 
     // Open the default match.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_RETURN, false, false, false, false));
     GURL url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kSearchTextURL, url.spec().c_str());
 
     // Test that entering a single character then Enter performs a search.
     browser()->FocusLocationBar();
     EXPECT_TRUE(edit_view->IsSelectAll());
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchSingleCharKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     EXPECT_EQ(kSearchSingleChar, UTF16ToUTF8(edit_view->GetText()));
 
     // Check if the default match result is Search Primary Provider.
     ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED,
               popup_model->result().default_match()->type);
 
     // Open the default match.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_RETURN, false, false, false, false));
     url = browser()->GetSelectedTabContents()->GetURL();
     EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());
   }
 
   void EscapeToDefaultMatchTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kInlineAutocompleteTextKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     string16 old_text = edit_view->GetText();
 
     // Make sure inline autocomplete is triggerred.
     EXPECT_GT(old_text.length(), arraysize(kInlineAutocompleteText) - 1);
 
     size_t old_selected_line = popup_model->selected_line();
     EXPECT_EQ(0U, old_selected_line);
 
     // Move to another line with different text.
     size_t size = popup_model->result().size();
     while (popup_model->selected_line() < size - 1) {
-      ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DOWN, false, false, false));
+      ASSERT_NO_FATAL_FAILURE(
+          SendKey(ui::VKEY_DOWN, false, false, false, false));
       ASSERT_NE(old_selected_line, popup_model->selected_line());
       if (old_text != edit_view->GetText())
         break;
     }
 
     EXPECT_NE(old_text, edit_view->GetText());
 
     // Escape shall revert back to the default match item.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_ESCAPE, false, false, false, false));
     EXPECT_EQ(old_text, edit_view->GetText());
     EXPECT_EQ(old_selected_line, popup_model->selected_line());
   }
 
   void BasicTextOperationsTest() {
     ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
     browser()->FocusLocationBar();
 
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     string16 old_text = edit_view->GetText();
     EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
     EXPECT_TRUE(edit_view->IsSelectAll());
 
     string16::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(old_text.size(), end);
 
     // Move the cursor to the end.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false, false));
     EXPECT_FALSE(edit_view->IsSelectAll());
 
     // Make sure the cursor is placed correctly.
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(old_text.size(), start);
     EXPECT_EQ(old_text.size(), end);
 
     // Insert one character at the end. Make sure we won't insert
     // anything after the special ZWS mark used in gtk implementation.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, false, false, false, false));
     EXPECT_EQ(old_text + char16('a'), edit_view->GetText());
 
     // Delete one character from the end. Make sure we won't delete the special
     // ZWS mark used in gtk implementation.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
     EXPECT_EQ(old_text, edit_view->GetText());
 
     edit_view->SelectAll(true);
     EXPECT_TRUE(edit_view->IsSelectAll());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(old_text.size(), end);
 
     // Delete the content
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DELETE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_DELETE, false, false, false, false));
     EXPECT_TRUE(edit_view->IsSelectAll());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(0U, end);
     EXPECT_TRUE(edit_view->GetText().empty());
 
     // Check if RevertAll() can set text and cursor correctly.
     edit_view->RevertAll();
     EXPECT_FALSE(edit_view->IsSelectAll());
     EXPECT_EQ(old_text, edit_view->GetText());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(old_text.size(), start);
     EXPECT_EQ(old_text.size(), end);
   }
 
   void AcceptKeywordBySpaceTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     string16 text = UTF8ToUTF16(kSearchKeyword);
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text, edit_view->GetText());
 
     // Trigger keyword mode by space.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_SPACE, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_TRUE(edit_view->GetText().empty());
 
     // Revert to keyword hint mode.
     edit_view->model()->ClearKeyword(string16());
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text, edit_view->GetText());
 
@@ skipping 18 matching lines @@
     edit_view->model()->on_paste();
     edit_view->SetWindowTextAndCaretPos(text + char16(' '), text.length() + 1);
     edit_view->OnAfterPossibleChange();
     // Should be still in keyword hint mode.
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + char16(' '), edit_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space with a trailing
     // whitespace.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_SPACE, false, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
 
     // Keyword shouldn't be accepted by deleting the trailing space.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + char16(' '), edit_view->GetText());
 
     // Keyword shouldn't be accepted by pressing space in the middle
     // of content.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, false, false, false));
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, false, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_SPACE, false, false, false, false));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
 
     // Keyword shouldn't be accepted by pasting "foo bar".
     edit_view->SetUserText(string16());
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_TRUE(edit_view->model()->keyword().empty());
 
     edit_view->OnBeforePossibleChange();
@@ skipping 11 matching lines @@
     edit_view->OnInlineAutocompleteTextMaybeChanged(
         text + ASCIIToUTF16("  "), text.length());
     edit_view->OnAfterPossibleChange();
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(text + ASCIIToUTF16("  "), edit_view->GetText());
 
     string16::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     ASSERT_NE(start, end);
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_SPACE, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_EQ(string16(), edit_view->GetText());
 
     edit_view->SetUserText(string16());
 
     // Space should accept keyword even when inline autocomplete is available.
     const TestHistoryEntry kHistoryFoobar = {
       "http://www.foobar.com", "Page foobar", kSearchText, 10000, 10000, true
     };
 
     // Add a history entry to trigger inline autocomplete when typing "foo".
     ASSERT_NO_FATAL_FAILURE(
         AddHistoryEntry(kHistoryFoobar, Time::Now() - TimeDelta::FromHours(1)));
 
     // Type "foo" to trigger inline autocomplete.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(edit_view->model()->popup_model()->IsOpen());
     ASSERT_NE(text, edit_view->GetText());
 
     // Keyword hint shouldn't be visible.
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_TRUE(edit_view->model()->keyword().empty());
 
     // Trigger keyword mode by space.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_SPACE, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(text, edit_view->model()->keyword());
     ASSERT_TRUE(edit_view->GetText().empty());
   }
 
   void NonSubstitutingKeywordTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
     AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
@@ skipping 59 matching lines @@
     ASSERT_TRUE(popup_model);
 
     string16 old_text = edit_view->GetText();
 
     // Input something that can match history items.
     edit_view->SetUserText(ASCIIToUTF16("bar"));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     // Delete the inline autocomplete part.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_DELETE, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(
+        SendKey(ui::VKEY_DELETE, false, false, false, false));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
     ASSERT_GE(popup_model->result().size(), 3U);
 
     string16 user_text = edit_view->GetText();
     ASSERT_EQ(ASCIIToUTF16("bar"), user_text);
     edit_view->SelectAll(true);
     ASSERT_TRUE(edit_view->IsSelectAll());
 
     // The first item should be the default match.
@@ skipping 62 matching lines @@
     ASSERT_TRUE(edit_view->IsSelectAll());
   }
 
   void TabMoveCursorToEndTest() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     edit_view->SetUserText(ASCIIToUTF16("Hello world"));
 
     // Move cursor to the beginning.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, false, false, false));
 
     string16::size_type start, end;
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(0U, end);
 
     // Pressing tab should move cursor to the end.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
 
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(edit_view->GetText().size(), start);
     EXPECT_EQ(edit_view->GetText().size(), end);
 
     // The location bar should still have focus.
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
 
     // Select all text.
     edit_view->SelectAll(true);
     EXPECT_TRUE(edit_view->IsSelectAll());
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(0U, start);
     EXPECT_EQ(edit_view->GetText().size(), end);
 
     // Pressing tab should move cursor to the end.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
 
     edit_view->GetSelectionBounds(&start, &end);
     EXPECT_EQ(edit_view->GetText().size(), start);
     EXPECT_EQ(edit_view->GetText().size(), end);
 
     // The location bar should still have focus.
     ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
 
     // Pressing tab when cursor is at the end should change focus.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
 
     ASSERT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
   }
 
   void PersistKeywordModeOnTabSwitch() {
     AutocompleteEditView* edit_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Trigger keyword mode.
-    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false));
+    ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, false, false, false, false));
     ASSERT_FALSE(edit_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(edit_view->model()->keyword()));
 
     // Input something as search text.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
 
     // Create a new tab.
     browser()->NewTab();
 
     // Switch back to the first tab.
@@ skipping 110 matching lines @@
   browser()->FocusLocationBar();
 
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
 
   string16 old_text = edit_view->GetText();
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), old_text);
   EXPECT_TRUE(edit_view->IsSelectAll());
 
   // Undo should clear the omnibox.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Nothing should happen if undo again.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Redo should restore the original text.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, true, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, true, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
 
   // Looks like the undo manager doesn't support restoring selection.
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // The cursor should be at the end.
   string16::size_type start, end;
   edit_view->GetSelectionBounds(&start, &end);
   EXPECT_EQ(old_text.size(), start);
   EXPECT_EQ(old_text.size(), end);
 
   // Delete two characters.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
   EXPECT_EQ(old_text.substr(0, old_text.size() - 2), edit_view->GetText());
 
   // Undo delete.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
 
   // Redo delete.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, true, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, true, false, false));
   EXPECT_EQ(old_text.substr(0, old_text.size() - 2), edit_view->GetText());
 
   // Delete everything.
   edit_view->SelectAll(true);
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 
   // Undo delete everything.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_EQ(old_text.substr(0, old_text.size() - 2), edit_view->GetText());
 
   // Undo delete two characters.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_EQ(old_text, edit_view->GetText());
 
   // Undo again.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_Z, true, false, false, false));
   EXPECT_TRUE(edit_view->GetText().empty());
 }
 
 // See http://crbug.com/63860
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PrimarySelection) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   edit_view->SetUserText(ASCIIToUTF16("Hello world"));
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // Move the cursor to the end.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false, false));
 
   // Select all text by pressing Shift+Home
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, true, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_HOME, false, true, false, false));
   EXPECT_TRUE(edit_view->IsSelectAll());
 
   // The selected content should be saved to the PRIMARY clipboard.
   EXPECT_EQ("Hello world", GetPrimarySelectionText());
 
   // Move the cursor to the end.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false, false));
   EXPECT_FALSE(edit_view->IsSelectAll());
 
   // The content in the PRIMARY clipboard should not be cleared.
   EXPECT_EQ("Hello world", GetPrimarySelectionText());
 }
 
 // See http://crosbug.com/10306
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest,
                        BackspaceDeleteHalfWidthKatakana) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   // Insert text: ﾀﾞ
   edit_view->SetUserText(UTF8ToUTF16("\357\276\200\357\276\236"));
 
   // Move the cursor to the end.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_END, false, false, false, false));
 
   // Backspace should delete one character.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, false, false, false, false));
   EXPECT_EQ(UTF8ToUTF16("\357\276\200"), edit_view->GetText());
 }
 
 // http://crbug.com/12316
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewTest, PasteReplacingAll) {
   AutocompleteEditView* edit_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetAutocompleteEditView(&edit_view));
   AutocompletePopupModel* popup_model = edit_view->model()->popup_model();
   ASSERT_TRUE(popup_model);
 
   SetClipboardText(kSearchText);
 
   // Paste text.
-  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, true, false, false));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, true, false, false, false));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
   ASSERT_EQ(ASCIIToUTF16("abc"), edit_view->GetText());
 }
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 class AutocompleteEditViewViewsTest : public AutocompleteEditViewTest {
@@ skipping 64 matching lines @@
                        PersistKeywordModeOnTabSwitch) {
   PersistKeywordModeOnTabSwitch();
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteEditViewViewsTest,
                        CtrlKeyPressedWithInlineAutocompleteTest) {
   CtrlKeyPressedWithInlineAutocompleteTest();
 }
 
 #endif