Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/ui/gtk/view_id_util_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 <gtk/gtk.h>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
@@ skipping 26 matching lines @@
 
   for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
     // The following ids are used only in views implementation.
     if (i == VIEW_ID_CONTENTS_SPLIT ||
         i == VIEW_ID_INFO_BAR_CONTAINER ||
         i == VIEW_ID_DEV_TOOLS_DOCKED ||
         i == VIEW_ID_DOWNLOAD_SHELF ||
         i == VIEW_ID_BOOKMARK_BAR_ELEMENT ||
         i == VIEW_ID_TAB ||
         i == VIEW_ID_FEEDBACK_BUTTON ||
-        i == VIEW_ID_OMNIBOX ||
         i == VIEW_ID_SCRIPT_BUBBLE) {
       continue;
     }
 
     CheckViewID(static_cast<ViewID>(i), true);
   }
 
   CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
 }
 
 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
   CheckViewID(VIEW_ID_TAB_0, true);
   CheckViewID(VIEW_ID_TAB_1, false);
 
   browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL),
                      content::Referrer(),
                      NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED,
                      false));
 
   CheckViewID(VIEW_ID_TAB_0, true);
   CheckViewID(VIEW_ID_TAB_1, true);
 }