Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/ui/gtk/browser_toolbar_gtk.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 "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 262 matching lines @@
   SetViewIDs();
   theme_service_->InitThemesFor(this);
 }
 
 void BrowserToolbarGtk::SetViewIDs() {
   ViewIDUtil::SetID(widget(), VIEW_ID_TOOLBAR);
   ViewIDUtil::SetID(back_->widget(), VIEW_ID_BACK_BUTTON);
   ViewIDUtil::SetID(forward_->widget(), VIEW_ID_FORWARD_BUTTON);
   ViewIDUtil::SetID(reload_->widget(), VIEW_ID_RELOAD_BUTTON);
   ViewIDUtil::SetID(home_->widget(), VIEW_ID_HOME_BUTTON);
-  ViewIDUtil::SetID(location_bar_->widget(), VIEW_ID_LOCATION_BAR);
+  ViewIDUtil::SetID(location_bar_->widget(), VIEW_ID_OMNIBOX);
   ViewIDUtil::SetID(wrench_menu_button_->widget(), VIEW_ID_APP_MENU);
 }
 
 void BrowserToolbarGtk::Show() {
   gtk_widget_show(toolbar_);
 }
 
 void BrowserToolbarGtk::Hide() {
   gtk_widget_hide(toolbar_);
 }
@@ skipping 410 matching lines @@
                       allocation.x + x_offset,
                       allocation.y + y_offset);
 
   return FALSE;
 }
 
 void BrowserToolbarGtk::UpdateShowHomeButton() {
   bool visible = show_home_button_.GetValue() && !ShouldOnlyShowLocation();
   gtk_widget_set_visible(home_->widget(), visible);
 }