Consolidate VIEW_ID_LOCATION_BAR into VIEW_ID_OMNIBOX.

chrome/browser/ui/omnibox/omnibox_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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 39 matching lines @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
 namespace {
 
 const char kSearchKeyword[] = "foo";
 const char kSearchKeyword2[] = "footest.com";
-const wchar_t kSearchKeywordKeys[] = {
-  ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0
-};
+const wchar_t kSearchKeywordKeys[] = { ui::VKEY_F, ui::VKEY_O, ui::VKEY_O, 0 };
 const char kSearchURL[] = "http://www.foo.com/search?q={searchTerms}";
 const char kSearchShortName[] = "foo";
 const char kSearchText[] = "abc";
-const wchar_t kSearchTextKeys[] = {
-  ui::VKEY_A, ui::VKEY_B, ui::VKEY_C, 0
-};
+const wchar_t kSearchTextKeys[] = { ui::VKEY_A, ui::VKEY_B, ui::VKEY_C, 0 };
 const char kSearchTextURL[] = "http://www.foo.com/search?q=abc";
 const char kSearchSingleChar[] = "z";
 const wchar_t kSearchSingleCharKeys[] = { ui::VKEY_Z, 0 };
 const char kSearchSingleCharURL[] = "http://www.foo.com/search?q=z";
 
 const char kHistoryPageURL[] = "chrome://history/#q=abc";
 
 const char kDesiredTLDHostname[] = "www.bar.com";
-const wchar_t kDesiredTLDKeys[] = {
-  ui::VKEY_B, ui::VKEY_A, ui::VKEY_R, 0
-};
+const wchar_t kDesiredTLDKeys[] = { ui::VKEY_B, ui::VKEY_A, ui::VKEY_R, 0 };
 
 const char kInlineAutocompleteText[] = "def";
 const wchar_t kInlineAutocompleteTextKeys[] = {
   ui::VKEY_D, ui::VKEY_E, ui::VKEY_F, 0
 };
 
 // Hostnames that shall be blocked by host resolver.
 const char *kBlockedHostnames[] = {
   "foo",
   "*.foo.com",
@@ skipping 63 matching lines @@
 const int kCtrlOrCmdMask = ui::EF_COMMAND_DOWN;
 #else
 const int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN;
 #endif
 
 }  // namespace
 
 class OmniboxViewTest : public InProcessBrowserTest,
                         public content::NotificationObserver {
  protected:
-  OmniboxViewTest()
-      : location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR) {
-  }
-
   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.
-#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));
   }
 
   static void GetOmniboxViewForBrowser(
       const Browser* browser,
       OmniboxView** omnibox_view) {
     BrowserWindow* window = browser->window();
     ASSERT_TRUE(window);
     LocationBar* loc_bar = window->GetLocationBar();
     ASSERT_TRUE(loc_bar);
     *omnibox_view = loc_bar->GetLocationEntry();
@@ skipping 929 matching lines @@
     ASSERT_EQ(text, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(text, omnibox_view->model()->keyword());
     ASSERT_EQ(text, omnibox_view->GetText());
 
     // The location bar should still have focus.
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
     // Trigger keyword mode by tab.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(text, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // Revert to keyword hint mode with SHIFT+TAB.
 #if defined(OS_MACOSX)
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACKTAB, 0));
 #else
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
 #endif
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(text, omnibox_view->model()->keyword());
     ASSERT_EQ(text, omnibox_view->GetText());
-
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   }
 
   void TabTraverseResultsTest() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
     OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
     ASSERT_TRUE(popup_model);
 
     // Input something to trigger results.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
     ASSERT_TRUE(popup_model->IsOpen());
 
     size_t old_selected_line = popup_model->selected_line();
     EXPECT_EQ(0U, old_selected_line);
 
     // Move down the results.
     for (size_t size = popup_model->result().size();
          popup_model->selected_line() < size - 1;
          old_selected_line = popup_model->selected_line()) {
       ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
       ASSERT_LT(old_selected_line, popup_model->selected_line());
     }
 
     // Don't move past the end.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
     ASSERT_EQ(old_selected_line, popup_model->selected_line());
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
     // Move back up the results.
     for (; popup_model->selected_line() > 0U;
          old_selected_line = popup_model->selected_line()) {
       ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
       ASSERT_GT(old_selected_line, popup_model->selected_line());
     }
 
     // Don't move past the beginning.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
     ASSERT_EQ(0U, popup_model->selected_line());
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
     const TestHistoryEntry kHistoryFoo = {
       "http://foo/", "Page foo", kSearchText, 1, 1, false
     };
 
     // Add a history entry so "foo" gets multiple matches.
     ASSERT_NO_FATAL_FAILURE(
         AddHistoryEntry(kHistoryFoo, Time::Now() - TimeDelta::FromHours(1)));
 
     // Load results.
     ASSERT_NO_FATAL_FAILURE(omnibox_view->SelectAll(false));
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
 
     // Trigger keyword mode by tab.
     string16 text = ASCIIToUTF16(kSearchKeyword);
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(text, omnibox_view->model()->keyword());
     ASSERT_TRUE(omnibox_view->GetText().empty());
 
     // The location bar should still have focus.
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
     // Pressing tab again should move to the next result and clear keyword
     // mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
     ASSERT_EQ(1U, omnibox_view->model()->popup_model()->selected_line());
     ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
     ASSERT_NE(text, omnibox_view->model()->keyword());
 
     // The location bar should still have focus.
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
     // Moving back up should not show keyword mode.
     ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(text, omnibox_view->model()->keyword());
 
-    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                             location_bar_focus_view_id_));
+    ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   }
 
   void PersistKeywordModeOnTabSwitch() {
     OmniboxView* omnibox_view = NULL;
     ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
 
     // Trigger keyword hint mode.
     ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
     ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
     ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
@@ skipping 38 matching lines @@
     // Inline autocomplete should still be there.
     EXPECT_EQ(old_text, omnibox_view->GetText());
   }
 
 #if defined(USE_AURA)
   const BrowserView* GetBrowserView() const {
     return static_cast<BrowserView*>(browser()->window());
   }
 
   const views::View* GetFocusView() const {
-    return GetBrowserView()->GetViewByID(location_bar_focus_view_id_);
+    return GetBrowserView()->GetViewByID(VIEW_ID_OMNIBOX);
   }
 
   // Move the mouse to the center of the browser window and left-click.
   void ClickBrowserWindowCenter() {
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
                     GetBrowserView()->GetBoundsInScreen().CenterPoint()));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                     ui_controls::LEFT, ui_controls::DOWN));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                     ui_controls::LEFT, ui_controls::UP));
   }
 
   // Press and release the mouse in the focus view at an offset from its origin.
   // If |release_offset| differs from |press_offset|, the mouse will be moved
   // between the press and release.
   void ClickFocusViewOrigin(ui_controls::MouseButton button,
                             const gfx::Vector2d& press_offset,
                             const gfx::Vector2d& release_offset) {
     gfx::Point focus_view_origin = GetFocusView()->GetBoundsInScreen().origin();
     gfx::Point press_point = focus_view_origin + press_offset;
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(press_point));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::DOWN));
 
     gfx::Point release_point = focus_view_origin  + release_offset;
     if (release_point != press_point)
       ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(release_point));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP));
   }
 #endif  // defined(USE_AURA)
-
-  ViewID location_bar_focus_view_id() const {
-    return location_bar_focus_view_id_;
-  }
-
- private:
-  ViewID location_bar_focus_view_id_;
 };
 
 // Test if ctrl-* accelerators are workable in omnibox.
 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
 //
 // Flaky on interactive tests (dbg), http://crbug.com/69433
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DISABLED_BrowserAccelerators) {
   BrowserAcceleratorsTest();
 }
 
@@ skipping 363 matching lines @@
   omnibox_view->SetUserText(ASCIIToUTF16(target_url));
 
   // Set permanent text thus making sure that omnibox treats 'google.com'
   // as URL (not as ordinary user input).
   OmniboxEditModel* edit_model = omnibox_view->model();
   ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
   edit_model->UpdatePermanentText(ASCIIToUTF16("http://www.google.com/"));
 
   // Location bar must have focus to receive Ctrl-C.
   chrome::FocusLocationBar(browser());
-  ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
-                                           location_bar_focus_view_id()));
+  ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
   // Select full URL and copy it to clipboard. General text and html should
   // be available.
   omnibox_view->SelectAll(true);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->Clear(ui::Clipboard::BUFFER_STANDARD);
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_C, kCtrlOrCmdMask));
   EXPECT_TRUE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetPlainTextFormatType(), ui::Clipboard::BUFFER_STANDARD));
 
   // MAC is the only platform which doesn't write html.
 #if !defined(OS_MACOSX)
   EXPECT_TRUE(clipboard->IsFormatAvailable(
       ui::Clipboard::GetHtmlFormatType(), ui::Clipboard::BUFFER_STANDARD));
 #endif
 
   // These platforms should read bookmark format.
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   EXPECT_EQ(target_url, url);
   EXPECT_EQ(ASCIIToUTF16(target_url), title);
 #endif
 }