Omnibox: Preserve display text and select all on a focus search

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stddef.h>
 #include <stdio.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 866 matching lines @@
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
   ASSERT_GT(strlen(url::kAboutBlankURL), strlen(kSearchKeyword));
   ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
 
   // Make sure nothing DCHECKs.
   chrome::FocusSearch(browser());
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
 }
 
+// Make sure the display text is preserved on a focus search when the display
+// text is not the permanent text.
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PreserveDisplayTextOnFocusSearch) {
+  OmniboxView* omnibox_view = NULL;
+  ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
+
+  OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+  ASSERT_TRUE(popup_model);
+
+  // Input something that can match history items.
+  omnibox_view->SetUserText(ASCIIToUTF16("site.com/p"));
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_TRUE(popup_model->IsOpen());
+  ASSERT_EQ(ASCIIToUTF16("site.com/path/1"), omnibox_view->GetText());
+  base::string16::size_type start, end;
+  omnibox_view->GetSelectionBounds(&start, &end);
+  ASSERT_EQ(10U, std::min(start, end));
+  ASSERT_EQ(15U, std::max(start, end));
+
+  // Focus searching with autocomplete text should preserve the autocompleted
+  // text, and should select all.
+  chrome::FocusSearch(browser());
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_EQ(ASCIIToUTF16("site.com/path/1"), omnibox_view->GetText());
+  omnibox_view->GetSelectionBounds(&start, &end);
+  ASSERT_EQ(0U, std::min(start, end));
+  ASSERT_EQ(15U, std::max(start, end));
+
+  // Press backspace twice and the omnibox should be empty.
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
+  ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
+  EXPECT_EQ(base::string16(), omnibox_view->GetText());
+  omnibox_view->GetSelectionBounds(&start, &end);
+  ASSERT_EQ(0U, start);
+  ASSERT_EQ(0U, end);
+
+  // Focus searching when we select a non-default autocomplete entry should
+  // preserve the suggested text, and should select all.
+  omnibox_view->SetUserText(ASCIIToUTF16("site.com/p"));
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_TRUE(popup_model->IsOpen());
+  omnibox_view->model()->OnUpOrDownKeyPressed(1);
+  ASSERT_EQ(ASCIIToUTF16("www.site.com/path/2"), omnibox_view->GetText());
+  omnibox_view->GetSelectionBounds(&start, &end);
+  ASSERT_EQ(start, end);
+
+  chrome::FocusSearch(browser());
+  ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
+  ASSERT_EQ(ASCIIToUTF16("www.site.com/path/2"), omnibox_view->GetText());
+  omnibox_view->GetSelectionBounds(&start, &end);
+  ASSERT_EQ(0U, std::min(start, end));
+  ASSERT_EQ(19U, std::max(start, end));
+}
+
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, AcceptKeywordByTypingQuestionMark) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
   base::string16 search_keyword(ASCIIToUTF16(kSearchKeyword));
 
   // If the user gets into keyword mode by typing '?', they should be put into
   // keyword mode for their default search provider.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN));
   ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
@@ skipping 1045 matching lines @@
 
   // Now Shift+Right should do nothing, and Shift+Left should reduce.
   // At the end, so Shift+Right should do nothing.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(2u, GetSelectionSize(omnibox_view));
 
   // And Left should reduce by one character.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN));
   EXPECT_EQ(1u, GetSelectionSize(omnibox_view));
 }