Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/ui/views/toolbar_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 "chrome/browser/ui/views/toolbar_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 39 matching lines @@
   bool found_app_menu = false;
   const views::View* view = NULL;
   while (view != first_view) {
     focus_manager->AdvanceFocus(false);
     view = focus_manager->GetFocusedView();
     ids.push_back(view->id());
     if (view->id() == VIEW_ID_RELOAD_BUTTON)
       found_reload = true;
     if (view->id() == VIEW_ID_APP_MENU)
       found_app_menu = true;
-    if (view->id() == VIEW_ID_LOCATION_BAR || view->id() == VIEW_ID_OMNIBOX)
+    if (view->id() == VIEW_ID_OMNIBOX)
       found_location_bar = true;
     if (ids.size() > 100)
       GTEST_FAIL() << "Tabbed 100 times, still haven't cycled back!";
   }
 
   // Make sure we found a few key items.
   ASSERT_TRUE(found_reload);
   ASSERT_TRUE(found_app_menu);
   ASSERT_TRUE(found_location_bar);
 
@@ skipping 41 matching lines @@
       model, GURL("http://foo.com"), ASCIIToUTF16("Foo"));
 
   // We want to specifically test the case where the bookmark bar is
   // already showing when a window opens, so create a second browser
   // window with the same profile.
   Browser* second_browser = CreateBrowser(browser()->profile());
   RunToolbarCycleFocusTest(second_browser);
 }
 
 }  // namespace