Fix Windows InstantExtendedTest focus issues with OmniboxViewViews.

chrome/browser/ui/search/instant_extended_browsertest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 100 matching lines @@
            GetIntFromJS(contents, "mostVisitedItemsCount",
                         &most_visited_items_count_) &&
            GetIntFromJS(contents, "firstMostVisitedItemId",
                         &first_most_visited_item_id_) &&
            GetIntFromJS(contents, "onNativeSuggestionsCalls",
                         &on_native_suggestions_calls_) &&
            GetIntFromJS(contents, "onChangeCalls",
                         &on_change_calls_);
   }
 
+  // A convenience function to explicitly blur the omnibox and focus |contents|.
+  // TODO(msw|jered|sreeram): Fix test focus issues; see http://crbug.com/226189
+  void BlurOmniboxAndFocusContents(content::WebContents* contents) {
+    omnibox()->model()->OnWillKillFocus(contents->GetView()->GetNativeView());
+    omnibox()->model()->OnKillFocus();
+    contents->GetView()->Focus();
+    EXPECT_FALSE(omnibox()->model()->has_focus());
+    EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
+  }
+
   int on_most_visited_change_calls_;
   int most_visited_items_count_;
   int first_most_visited_item_id_;
   int on_native_suggestions_calls_;
   int on_change_calls_;
 };
 
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.
@@ skipping 33 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, ExtendedModeIsOn) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   EXPECT_TRUE(instant()->extended_enabled_);
 }
 
 // Test that Instant is preloaded when the omnibox is focused.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxFocusLoadsInstant) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
-  // Explicitly unfocus the omnibox.
-  EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));

[Jered, 2013/04/05 16:27:07]

The new code does not do this. Is it unnecessary?

[msw, 2013/04/05 16:39:02]

I suspect not if the test didn't break, but I restored it to be safe.

-  ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
-
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
-  EXPECT_FALSE(omnibox()->model()->has_focus());
+  // Blur the omnibox and focus the active web contents.
+  BlurOmniboxAndFocusContents(
+      browser()->tab_strip_model()->GetActiveWebContents());
 
   // Delete any existing overlay.
   instant()->overlay_.reset();
   EXPECT_FALSE(instant()->GetOverlayContents());
 
   // Refocus the omnibox. The InstantController should've preloaded Instant.
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_TRUE(omnibox()->model()->has_focus());
 
   content::WebContents* overlay = instant()->GetOverlayContents();
   EXPECT_TRUE(overlay);
 
   // Check that the page supports Instant, but it isn't showing.
   EXPECT_TRUE(instant()->overlay_->supports_instant());
   EXPECT_FALSE(instant()->IsOverlayingSearchResults());
   EXPECT_TRUE(instant()->model()->mode().is_default());
 
   // Adding a new tab shouldn't delete or recreate the overlay; otherwise,
   // what's the point of preloading?
   AddBlankTabAndShow(browser());
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 
   // Unfocusing and refocusing the omnibox should also preserve the overlay.
-  ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
-  EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
-
+  BlurOmniboxAndFocusContents(
+    browser()->tab_strip_model()->GetActiveWebContents());
   FocusOmnibox();
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
   EXPECT_EQ(overlay, instant()->GetOverlayContents());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, InputShowsOverlay) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   // Focus omnibox and confirm overlay isn't shown.
   FocusOmniboxAndWaitForInstantExtendedSupport();
@@ skipping 142 matching lines @@
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
       content::NotificationService::AllSources());
 
   // Do a search and commit it.
   SetOmniboxTextAndWaitForOverlayToShow("hello k");
   EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
   browser()->window()->GetLocationBar()->AcceptInput();
   observer.Wait();
 
-  // With a committed results page, do a search by unfocusing the omnibox and
-  // focusing the contents.
+  // With a committed results page, do a search by bluring the omnibox and

[Jered, 2013/04/05 16:27:07]

bluring -> blurring

[msw, 2013/04/05 16:39:02]

Done.

+  // focusing the contents. Call handleOnChange before focusing the contents.
   SetOmniboxText("hello");
-  // Calling handleOnChange manually to make sure it is called before the
-  // Focus() call below.
   EXPECT_TRUE(content::ExecuteScript(instant()->instant_tab()->contents(),
                                      "suggestion = 'hello kitty';"
                                      "handleOnChange();"));
-  instant()->instant_tab()->contents()->GetView()->Focus();
+  BlurOmniboxAndFocusContents(instant()->instant_tab()->contents());
 
   // Search term extraction should kick in with the autocompleted text.
   EXPECT_EQ(ASCIIToUTF16("hello kitty"), omnibox()->GetText());
 
   // Suggestion should be cleared at this point.
   EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
 }
 
 // Checks that a previous Navigation suggestion is not re-used when a search
 // suggestion comes in. Disabled on Mac because omnibox focus loss is not
@@ skipping 16 matching lines @@
                             "behavior = 1;"));
   SetOmniboxTextAndWaitForOverlayToShow("exa");
   EXPECT_EQ(ASCIIToUTF16("example.com"), omnibox()->GetText());
 
   // Now send a search suggestion and see that Navigation suggestion is no
   // longer kept.
   SetOmniboxText("exam");
   EXPECT_TRUE(ExecuteScript("suggestion = 'exams are great';"
                             "behavior = 2;"
                             "handleOnChange();"));
-  instant()->overlay()->contents()->GetView()->Focus();
+  BlurOmniboxAndFocusContents(instant()->overlay()->contents());
   EXPECT_EQ(ASCIIToUTF16("exams are great"), omnibox()->GetText());
 
   // TODO(jered): Remove this after fixing OnBlur().
   omnibox()->RevertAll();
 }
 
 // This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and back to the original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsWithArrowKeys) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
@@ skipping 212 matching lines @@
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_NE(ntp_url, active_tab->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, OmniboxHasFocusOnNewTab) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
-  // Explicitly unfocus the omnibox.
-  EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));

[Jered, 2013/04/05 16:27:07]

Same question here.

[msw, 2013/04/05 16:39:02]

Done.

-  ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
-  EXPECT_FALSE(omnibox()->model()->has_focus());
+  // Explicitly blur the omnibox.
+  BlurOmniboxAndFocusContents(
+      browser()->tab_strip_model()->GetActiveWebContents());
 
   // Open new tab. Preloaded NTP contents should have been used.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   // Omnibox should have focus.
   EXPECT_TRUE(omnibox()->model()->has_focus());
@@ skipping 767 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   EXPECT_EQ(instant_url(), instant()->ntp_->contents()->GetURL());
 
   // The second argument says to use only the local overlay.
   instant()->SetInstantEnabled(false, true);
 
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl),
             instant()->ntp_->contents()->GetURL());
 }