Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/browser_keyevents_browsertest.cc

Index: chrome/browser/browser_keyevents_browsertest.cc
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 6704bc13d4d7e844a1569380a84f050f4050e306..5dd8c0442280cc5ecaf27f585eb8828c08aaa5bf 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -27,6 +27,7 @@
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/test_server.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/controls/textfield/textfield.h"
 
 using content::DomOperationNotificationDetails;
 using content::NavigationController;
@@ -638,11 +639,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
   // TODO(isherman): This is an experimental change to help diagnose
   // http://crbug.com/55713
   content::RunAllPendingInMessageLoop();
-#if defined(USE_AURA)
   EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX));
-#else
-  EXPECT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
-#endif
   // No element should be focused, as Alt+D was handled by the browser.
   EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));