Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/ui/omnibox/action_box_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 "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 18 matching lines @@
 
 class ActionBoxTest : public InProcessBrowserTest,
                       public content::NotificationObserver {
  protected:
   ActionBoxTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
     ASSERT_NO_FATAL_FAILURE(SetupComponents());
     chrome::FocusLocationBar(browser());
-    // Use Textfield's view id on pure views. See crbug.com/71144.
-    ViewID location_bar_focus_view_id = VIEW_ID_LOCATION_BAR;
-#if defined(USE_AURA)
-    location_bar_focus_view_id = VIEW_ID_OMNIBOX;
-#endif
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Enable Action Box UI for the test.
     command_line->AppendSwitchASCII(switches::kActionBox, "1");
   }
 
   void SetupComponents() {}
 
   virtual void Observe(int type,
@@ skipping 39 matching lines @@
   // Page is now bookmarked.
   ASSERT_TRUE(loc_bar->GetBookmarkStarVisibility());
 
   // Get the BookmarkModel to unbookmark the bookmark.
   bookmark_utils::RemoveAllBookmarks(model, GURL("http://www.google.com"));
 
   // Page is now unbookmarked.
   ASSERT_FALSE(loc_bar->GetBookmarkStarVisibility());
 
 }