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

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index d864577a5a9dbdfe87f8d7e841120da2a01566fc..11f802998d98324fd8c238b778f94419dce2e8a7 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -557,14 +557,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BackspaceInKeywordMode) {
             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());
 
@@ -584,7 +577,6 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_Escape) {
   EXPECT_EQ(old_text, omnibox_view->GetText());
   EXPECT_TRUE(omnibox_view->IsSelectAll());
 }
-#undef MAYBE_ESCAPE
 
 #if defined(OS_LINUX)
 #define MAYBE_DesiredTLD DISABLED_DesiredTLD