Fixing ESC in instant-extended.

chrome/browser/instant/instant_extended_browsertest.cc

 // Copyright 2013 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 "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_test_utils.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 15 matching lines @@
     omnibox()->model()->OnUpOrDownKeyPressed(1);
     // Wait for JavaScript to run the key handler by executing a blank script.
     EXPECT_TRUE(ExecuteScript(std::string()));
   }
 
   void SendUpArrow() {
     omnibox()->model()->OnUpOrDownKeyPressed(-1);
     // Wait for JavaScript to run the key handler by executing a blank script.
     EXPECT_TRUE(ExecuteScript(std::string()));
   }
+
+  void SendEscape() {
+    omnibox()->model()->OnEscapeKeyPressed();
+    // Wait for JavaScript to run the key handler by executing a blank script.
+    EXPECT_TRUE(ExecuteScript(std::string()));
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, ExtendedModeIsOn) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   EXPECT_TRUE(instant()->extended_enabled_);
 }
 
 // Test that Instant is preloaded when the omnibox is focused.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxFocusLoadsInstant) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
@@ skipping 97 matching lines @@
   // Commit the overlay by lost focus (e.g. clicking on the page).
   instant()->CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
 
   // Search term extraction should kick in with the autocompleted text.
   EXPECT_EQ(ASCIIToUTF16("johnny depp"), omnibox()->GetText());
 
   // Suggestion should be cleared at this point.
   EXPECT_EQ(ASCIIToUTF16(""), omnibox()->GetInstantSuggestion());
 }
 
-// This test simulates a search provider using the InstantExtended API to
-// navigate through the suggested results and back to the original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsWithArrowKeys) {
+  // This test simulates a search provider using the InstantExtended API to
+  // navigate through the suggested results and back to the original user query.
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
 
   SetOmniboxTextAndWaitForInstantToShow("hello");
   EXPECT_EQ("hello", GetOmniboxText());
 
   SendDownArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendDownArrow();
   EXPECT_EQ("result 2", GetOmniboxText());
   SendUpArrow();
   EXPECT_EQ("result 1", GetOmniboxText());
   SendUpArrow();
   EXPECT_EQ("hello", GetOmniboxText());
 }
+
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsAndHitEscape) {
+  // This test simulates a search provider using the InstantExtended API to
+  // navigate through the suggested results and hitting escape to get back to
+  // the original user query.
+  ASSERT_NO_FATAL_FAILURE(SetupInstant());
+  FocusOmniboxAndWaitForInstantSupport();
+
+  SetOmniboxTextAndWaitForInstantToShow("hello");
+  EXPECT_EQ("hello", GetOmniboxText());
+
+  SendDownArrow();
+  EXPECT_EQ("result 1", GetOmniboxText());
+  SendDownArrow();
+  EXPECT_EQ("result 2", GetOmniboxText());
+  SendEscape();
+  EXPECT_EQ("hello", GetOmniboxText());
+}