Change visibility semantics for Instant.

chrome/browser/instant/instant_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/stringprintf.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 676 matching lines @@
 
   TabContents* active_tab = chrome::GetActiveTabContents(browser());
   TabContents* preview_tab = instant()->GetPreviewContents();
 
   // Inititally, the active tab is showing; the preview is not.
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(preview_tab, false));
 
   // Type a query and wait for Instant to show.
   SetOmniboxTextAndWaitForInstantToShow("query");
-  EXPECT_TRUE(CheckVisibilityIs(active_tab, false));
+  EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(preview_tab, true));
 
   // Deleting the omnibox text should hide the preview.
   SetOmniboxText("");
   EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(preview_tab, false));
 
   // Typing a query should show the preview again.
   SetOmniboxTextAndWaitForInstantToShow("query");
-  EXPECT_TRUE(CheckVisibilityIs(active_tab, false));
+  EXPECT_TRUE(CheckVisibilityIs(active_tab, true));
   EXPECT_TRUE(CheckVisibilityIs(preview_tab, true));
 
   // Commit the preview.
   browser()->window()->GetLocationBar()->AcceptInput();
   EXPECT_EQ(preview_tab, chrome::GetActiveTabContents(browser()));
   EXPECT_TRUE(CheckVisibilityIs(preview_tab, true));
 }
 
 // Test that the task manager identifies Instant's preview tab correctly.
 IN_PROC_BROWSER_TEST_F(InstantTest, TaskManagerPrefix) {
@@ skipping 92 matching lines @@
   base::RunLoop run_loop3;
   std::vector<string16> queries;
   history->GetMostRecentKeywordSearchTerms(template_url->id(),
       ASCIIToUTF16("s"), 1, &consumer,
       base::Bind(&KeywordQueryDone, &run_loop3, &queries));
   run_loop3.Run();
   ASSERT_TRUE(queries.size());
   EXPECT_EQ(ASCIIToUTF16("search"), queries[0]);
 }
 
-#if defined(OS_WIN)
-// On Windows, NewEmptyWindow() fails the "GetBackingStore called while hidden"
-// CHECK(). TODO(sreeram): Fix it.
-#define MAYBE_NewWindowDismissesInstant DISABLED_NewWindowDismissesInstant
-#else
-#define MAYBE_NewWindowDismissesInstant NewWindowDismissesInstant
-#endif
 // Test that creating a new window hides any currently showing Instant preview.
-IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_NewWindowDismissesInstant) {
+IN_PROC_BROWSER_TEST_F(InstantTest, NewWindowDismissesInstant) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant("instant.html"));
   EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   SetOmniboxTextAndWaitForInstantToShow("search");
 
   Browser* previous_window = browser();
   EXPECT_TRUE(instant()->IsCurrent());
   EXPECT_TRUE(instant()->is_showing());
 
   content::WindowedNotificationObserver instant_hidden_observer(
       chrome::NOTIFICATION_INSTANT_CONTROLLER_HIDDEN,
@@ skipping 27 matching lines @@
   // Instant is showing, so OnStaleLoader() shouldn't kill the preview.
   instant()->stale_loader_timer_.Stop();
   instant()->OnStaleLoader();
   EXPECT_TRUE(instant()->is_showing());
 
   // The preview should be recreated once the omnibox loses focus.
   EXPECT_TRUE(instant()->loader()->supports_instant());
   instant()->OnAutocompleteLostFocus(NULL);
   EXPECT_FALSE(instant()->loader()->supports_instant());
 }