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

Side by Side Diff: chrome/browser/instant/instant_extended_browsertest.cc

Issue 12638006: disable failed InstantExtendedTest.TranscientEntryRemoved (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reupload Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <sstream> 5 #include <sstream>
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 const content::NavigationEntry* transient_entry = 1041 const content::NavigationEntry* transient_entry =
1042 active_tab->GetController().GetTransientEntry(); 1042 active_tab->GetController().GetTransientEntry();
1043 const content::NavigationEntry* committed_entry = 1043 const content::NavigationEntry* committed_entry =
1044 active_tab->GetController().GetLastCommittedEntry(); 1044 active_tab->GetController().GetLastCommittedEntry();
1045 EXPECT_EQ(transient_entry->GetURL(), committed_entry->GetURL()); 1045 EXPECT_EQ(transient_entry->GetURL(), committed_entry->GetURL());
1046 EXPECT_NE(transient_entry->GetPageID(), committed_entry->GetPageID()); 1046 EXPECT_NE(transient_entry->GetPageID(), committed_entry->GetPageID());
1047 } 1047 }
1048 1048
1049 // Test that the a transient entry is cleared when the overlay is committed 1049 // Test that the a transient entry is cleared when the overlay is committed
1050 // with a navigation. 1050 // with a navigation.
1051 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, TransientEntryRemoved) { 1051 // TODO(samarth) : this test fails, http://crbug.com/181070.
1052 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_TransientEntryRemoved) {
1052 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser())); 1053 ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
1053 1054
1054 // Focus omnibox and confirm overlay isn't shown. 1055 // Focus omnibox and confirm overlay isn't shown.
1055 FocusOmniboxAndWaitForInstantSupport(); 1056 FocusOmniboxAndWaitForInstantSupport();
1056 content::WebContents* overlay = instant()->GetOverlayContents(); 1057 content::WebContents* overlay = instant()->GetOverlayContents();
1057 EXPECT_TRUE(overlay); 1058 EXPECT_TRUE(overlay);
1058 EXPECT_TRUE(instant()->model()->mode().is_default()); 1059 EXPECT_TRUE(instant()->model()->mode().is_default());
1059 EXPECT_FALSE(instant()->IsOverlayingSearchResults()); 1060 EXPECT_FALSE(instant()->IsOverlayingSearchResults());
1060 1061
1061 // Create an observer to wait for the commit. 1062 // Create an observer to wait for the commit.
(...skipping 21 matching lines...) Expand all
1083 // The page has navigated so there should be no transient entry. 1084 // The page has navigated so there should be no transient entry.
1084 const content::NavigationEntry* transient_entry = 1085 const content::NavigationEntry* transient_entry =
1085 active_tab->GetController().GetTransientEntry(); 1086 active_tab->GetController().GetTransientEntry();
1086 EXPECT_EQ(NULL, transient_entry); 1087 EXPECT_EQ(NULL, transient_entry);
1087 1088
1088 // The last committed entry should be the URL the page navigated to. 1089 // The last committed entry should be the URL the page navigated to.
1089 const content::NavigationEntry* committed_entry = 1090 const content::NavigationEntry* committed_entry =
1090 active_tab->GetController().GetLastCommittedEntry(); 1091 active_tab->GetController().GetLastCommittedEntry();
1091 EXPECT_TRUE(EndsWith(committed_entry->GetURL().spec(), "#q=query", true)); 1092 EXPECT_TRUE(EndsWith(committed_entry->GetURL().spec(), "#q=query", true));
1092 } 1093 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698