Handle Esc key press event in Local NTP.

chrome/browser/ui/search/instant_extended_interactive_uitest.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 <sstream>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 91 matching lines @@
 
 class InstantExtendedTest : public InProcessBrowserTest,
                             public InstantTestBase {
  public:
   InstantExtendedTest()
       : on_most_visited_change_calls_(0),
         most_visited_items_count_(0),
         first_most_visited_item_id_(0),
         on_native_suggestions_calls_(0),
         on_change_calls_(0),
-        submit_count_(0) {
+        submit_count_(0),
+        on_esc_key_press_event_calls_(0) {
   }
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url);
   }
 
@@ skipping 30 matching lines @@
                         &most_visited_items_count_) &&
            GetIntFromJS(contents, "firstMostVisitedItemId",
                         &first_most_visited_item_id_) &&
            GetIntFromJS(contents, "onNativeSuggestionsCalls",
                         &on_native_suggestions_calls_) &&
            GetIntFromJS(contents, "onChangeCalls",
                         &on_change_calls_) &&
            GetIntFromJS(contents, "submitCount",
                         &submit_count_) &&
            GetStringFromJS(contents, "apiHandle.value",
-                           &query_value_);
+                           &query_value_) &&
+           GetIntFromJS(contents, "onEscKeyPressedCalls",
+                        &on_esc_key_press_event_calls_);
   }
 
   TemplateURL* GetDefaultSearchProviderTemplateURL() {
     TemplateURLService* template_url_service =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     if (template_url_service)
       return template_url_service->GetDefaultSearchProvider();
     return NULL;
   }
 
@@ skipping 29 matching lines @@
     return omnibox()->model()->autocomplete_controller()->search_provider()->
         matches().size();
   }
 
   int on_most_visited_change_calls_;
   int most_visited_items_count_;
   int first_most_visited_item_id_;
   int on_native_suggestions_calls_;
   int on_change_calls_;
   int submit_count_;
+  int on_esc_key_press_event_calls_;
   std::string query_value_;
 };
 
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
@@ skipping 1718 matching lines @@
   SetOmniboxText("");
 
   EXPECT_TRUE(GetIntFromJS(
       overlay,
       "chrome.embeddedSearch.searchBox.nativeSuggestions.length",
       &num_autocomplete_results));
   EXPECT_EQ(0, num_autocomplete_results);
 }
 
 // Test that hitting Esc to clear the omnibox works. http://crbug.com/231744.
-// TODO(sreeram): reenable once ESC bug is actually fixed.
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_EscapeClearsOmnibox) {
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, EscapeClearsOmnibox) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
 
   // Navigate to the Instant NTP, and wait for it to be recognized.
   content::WindowedNotificationObserver instant_tab_observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURLWithDisposition(browser(),
                                               GURL(chrome::kChromeUINewTabURL),
                                               CURRENT_TAB,
@@ skipping 16 matching lines @@
   // Hit Escape, and verify that the page sees that the query is cleared.
   SendEscape();
   EXPECT_TRUE(GetStringFromJS(contents, "chrome.embeddedSearch.searchBox.value",
                               &query));
   EXPECT_EQ("", query);
   EXPECT_EQ("", GetOmniboxText());
 
   EXPECT_TRUE(UpdateSearchState(contents));
   EXPECT_LT(0, on_change_calls_);
   EXPECT_EQ(0, submit_count_);
+  EXPECT_LT(0, on_esc_key_press_event_calls_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OnDefaultSearchProviderChanged) {
   InstantService* instant_service =
       InstantServiceFactory::GetForProfile(browser()->profile());
   ASSERT_NE(static_cast<InstantService*>(NULL), instant_service);
 
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
@@ skipping 319 matching lines @@
   content::WindowedNotificationObserver autocomplete_observer(
       chrome::NOTIFICATION_INSTANT_SENT_AUTOCOMPLETE_RESULTS,
       content::NotificationService::AllSources());
 
   SetOmniboxText("http://www.example.com");
 
   autocomplete_observer.Wait();
   ASSERT_TRUE(omnibox()->model()->autocomplete_controller()->
               search_provider()->IsNonInstantSearchDone());
 }