Fix a variety of omnibox bugs around zerosuggest, the escape key, or both.

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 <stdio.h>
 
 #include "base/command_line.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 539 matching lines @@
 #endif
   // Backspace at the beginning of the search text shall turn off
   // the keyword mode.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
   ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
   ASSERT_EQ(base::string16(), omnibox_view->model()->keyword());
   ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
             UTF16ToUTF8(omnibox_view->GetText()));
 }
 
-// http://crbug.com/158913
-#if defined(USE_AURA)
-#define MAYBE_Escape DISABLED_Escape
-#else
-#define MAYBE_Escape Escape
-#endif
-
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Escape) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, Escape) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIHistoryURL));
   chrome::FocusLocationBar(browser());
 
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
   base::string16 old_text = omnibox_view->GetText();
   EXPECT_FALSE(old_text.empty());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 
   // Delete all text in omnibox.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
   EXPECT_TRUE(omnibox_view->GetText().empty());
 
   // Escape shall revert the text in omnibox.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0));
   EXPECT_EQ(old_text, omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 }
-#undef MAYBE_ESCAPE
 
 #if defined(OS_LINUX)
 #define MAYBE_DesiredTLD DISABLED_DesiredTLD
 #else
 #define MAYBE_DesiredTLD DesiredTLD
 #endif
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DesiredTLD) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
@@ skipping 1269 matching lines @@
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   test_toolbar_model->set_text(url_b);
   omnibox_view->Update();
   EXPECT_EQ(url_a, omnibox_view->GetText());
   omnibox_view->RevertAll();
   EXPECT_EQ(url_b, omnibox_view->GetText());
   test_toolbar_model->set_text(url_c);
   omnibox_view->Update();
   EXPECT_EQ(url_c, omnibox_view->GetText());
 }