Use Textfield's view ID instead of Location bar's view id

chrome/browser/ui/views/find_bar_host_interactive_uitest.cc

 // Copyright (c) 2011 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/process_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ skipping 20 matching lines @@
 static const char kSimplePage[] = "files/find_in_page/simple.html";
 
 void Checkpoint(const char* message, const base::TimeTicks& start_time) {
   LOG(INFO) << message << " : "
     << (base::TimeTicks::Now() - start_time).InMilliseconds()
     << " ms" << std::flush;
 }
 
 class FindInPageTest : public InProcessBrowserTest {
  public:
-  FindInPageTest() {
+  FindInPageTest() :
+#if defined(USE_AURA)
+      location_bar_focus_view_id_(VIEW_ID_OMNIBOX)
+#else
+      location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR)
+#endif
+  {
     set_show_window(true);
     FindBarHost::disable_animations_during_testing_ = true;
   }
 
   string16 GetFindBarText() {
     FindBarTesting* find_bar =
         browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindText();
   }
 
   string16 GetFindBarSelectedText() {
     FindBarTesting* find_bar =
         browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindSelectedText();
   }
+
+  ViewID location_bar_focus_view_id_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FindInPageTest);
 };
 
 }  // namespace
 
 #if defined(TOOLKIT_USES_GTK)
 #define MAYBE_CrashEscHandlers FLAKY_CrashEscHandlers
 #else
 #define MAYBE_CrashEscHandlers CrashEscHandlers
 #endif
 
@@ skipping 15 matching lines @@
 
   // Select tab A.
   browser()->ActivateTabAt(0, true);
 
   // Close tab B.
   browser()->CloseTabContents(browser()->GetTabContentsAt(1));
 
   // Click on the location bar so that Find box loses focus.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(),
                                                      VIEW_ID_LOCATION_BAR));
-#if defined(TOOLKIT_VIEWS) || defined(OS_WIN)
   // Check the location bar is focused.
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
-#endif
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
 
   // This used to crash until bug 1303709 was fixed.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_ESCAPE, false, false, false, false));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
   ASSERT_TRUE(test_server()->Start());
 
   GURL url = test_server()->GetURL("title1.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Focus the location bar, open and close the find-in-page, focus should
   // return to the location bar.
   browser()->FocusLocationBar();
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
   // Ensure the creation of the find bar controller.
   browser()->GetFindBarController()->Show();
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
 
   // Focus the location bar, find something on the page, close the find box,
   // focus should go to the page.
   browser()->FocusLocationBar();
   browser()->Find();
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   ui_test_utils::FindInPage(browser()->GetSelectedTabContentsWrapper(),
                             ASCIIToUTF16("a"), true, false, NULL);
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
   // Focus the location bar, open and close the find box, focus should return to
   // the location bar (same as before, just checking that http://crbug.com/23599
   // is fixed).
   browser()->FocusLocationBar();
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
   browser()->GetFindBarController()->Show();
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestoreOnTabSwitch) {
   ASSERT_TRUE(test_server()->Start());
 
   // First we navigate to our test page (tab A).
   GURL url = test_server()->GetURL(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->Find();
@@ skipping 20 matching lines @@
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
 
   // Search for 'b'.
   ui_test_utils::FindInPage(browser()->GetSelectedTabContentsWrapper(),
                             ASCIIToUTF16("b"), true, false, NULL);
   EXPECT_TRUE(ASCIIToUTF16("b") == find_bar->GetFindSelectedText());
 
   // Set focus away from the Find bar (to the Location bar).
   browser()->FocusLocationBar();
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
 
   // Select tab A. Find bar should get focus.
   browser()->ActivateTabAt(0, true);
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
                                            VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
   EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText());
 
   // Select tab B. Location bar should get focus.
   browser()->ActivateTabAt(1, true);
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
+  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(),
+                                           location_bar_focus_view_id_));
 }
 
 // This tests that whenever you clear values from the Find box and close it that
 // it respects that and doesn't show you the last search, as reported in bug:
 // http://crbug.com/40121.
 IN_PROC_BROWSER_TEST_F(FindInPageTest, PrepopulateRespectBlank) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
@@ skipping 136 matching lines @@
           chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source);
 
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_V, true, false, false, false));
 
   ASSERT_NO_FATAL_FAILURE(observer.Wait());
   FindNotificationDetails details;
   ASSERT_TRUE(observer.GetDetailsFor(notification_source.map_key(), &details));
   EXPECT_TRUE(details.number_of_matches() > 0);
 }