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

Side by Side Diff: content/browser/session_history_browsertest.cc

Issue 1185783002: [SP] Temporarily disable two frame navigation tests made flaky by slimming paint. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge changes. Created 5 years, 6 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
« 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/strings/string_util.h" 5 #include "base/strings/string_util.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/browser/navigation_controller.h" 8 #include "content/public/browser/navigation_controller.h"
9 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
10 #include "content/public/browser/notification_types.h" 10 #include "content/public/browser/notification_types.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 171
172 GoForward(); 172 GoForward();
173 EXPECT_EQ("bot1", GetTabTitle()); 173 EXPECT_EQ("bot1", GetTabTitle());
174 174
175 GoForward(); 175 GoForward();
176 EXPECT_EQ("bot3", GetTabTitle()); 176 EXPECT_EQ("bot3", GetTabTitle());
177 } 177 }
178 178
179 // Test that back/forward works when navigating in subframes. 179 // Test that back/forward works when navigating in subframes.
180 // If this flakes, use http://crbug.com/48833 180 // If this flakes, use http://crbug.com/48833
181 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameBackForward) { 181 // TODO(wkorman): Re-enable after fix for http://crbug.com/498938 is in.
182 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, DISABLED_FrameBackForward) {
182 ASSERT_FALSE(CanGoBack()); 183 ASSERT_FALSE(CanGoBack());
183 184
184 ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1")); 185 ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1"));
185 186
186 ClickLink("abot2"); 187 ClickLink("abot2");
187 EXPECT_EQ("bot2", GetTabTitle()); 188 EXPECT_EQ("bot2", GetTabTitle());
188 GURL frames(GetURL("frames.html")); 189 GURL frames(GetURL("frames.html"));
189 EXPECT_EQ(frames, GetTabURL()); 190 EXPECT_EQ(frames, GetTabURL());
190 191
191 ClickLink("abot3"); 192 ClickLink("abot3");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 EXPECT_EQ("bot2", GetTabTitle()); 229 EXPECT_EQ("bot2", GetTabTitle());
229 EXPECT_EQ(frames, GetTabURL()); 230 EXPECT_EQ(frames, GetTabURL());
230 231
231 GoBack(); 232 GoBack();
232 EXPECT_EQ("bot1", GetTabTitle()); 233 EXPECT_EQ("bot1", GetTabTitle());
233 EXPECT_EQ(frames, GetTabURL()); 234 EXPECT_EQ(frames, GetTabURL());
234 } 235 }
235 236
236 // Test that back/forward preserves POST data and document state in subframes. 237 // Test that back/forward preserves POST data and document state in subframes.
237 // If this flakes use http://crbug.com/61619 238 // If this flakes use http://crbug.com/61619
238 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameFormBackForward) { 239 // TODO(wkorman): Re-enable after fix for http://crbug.com/498938 is in.
240 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, DISABLED_FrameFormBackForward) {
239 ASSERT_FALSE(CanGoBack()); 241 ASSERT_FALSE(CanGoBack());
240 242
241 ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1")); 243 ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("frames.html", "bot1"));
242 244
243 ClickLink("aform"); 245 ClickLink("aform");
244 EXPECT_EQ("form", GetTabTitle()); 246 EXPECT_EQ("form", GetTabTitle());
245 GURL frames(GetURL("frames.html")); 247 GURL frames(GetURL("frames.html"));
246 EXPECT_EQ(frames, GetTabURL()); 248 EXPECT_EQ(frames, GetTabURL());
247 249
248 SubmitForm("isubmit"); 250 SubmitForm("isubmit");
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 NavigateToURL(shell(), GetURL("title2.html")); 492 NavigateToURL(shell(), GetURL("title2.html"));
491 493
492 ASSERT_TRUE(ExecuteScriptAndExtractInt( 494 ASSERT_TRUE(ExecuteScriptAndExtractInt(
493 shell()->web_contents(), 495 shell()->web_contents(),
494 "domAutomationController.send(history.length)", 496 "domAutomationController.send(history.length)",
495 &length)); 497 &length));
496 EXPECT_EQ(2, length); 498 EXPECT_EQ(2, length);
497 } 499 }
498 500
499 } // namespace content 501 } // namespace content
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