Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1277)

Unified Diff: chrome/browser/instant/instant_browsertest.cc

Issue 10959049: Change visibility semantics for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable a test Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_browsertest.cc
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index b219eb459b95e03219980cfef2b1254b0ad3a796..65df4a35132937c8152da886c7c157e28afc09da 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -694,7 +694,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, PageVisibility) {
// 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.
@@ -704,7 +704,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, PageVisibility) {
// 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.
@@ -817,15 +817,8 @@ IN_PROC_BROWSER_TEST_F(InstantTest, History) {
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");
« no previous file with comments | « no previous file | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698