OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/string_util.h" | 5 #include "base/string_util.h" |
6 #include "chrome/common/url_constants.h" | 6 #include "chrome/common/url_constants.h" |
7 #include "chrome/test/automation/tab_proxy.h" | 7 #include "chrome/test/automation/tab_proxy.h" |
8 #include "chrome/test/automation/browser_proxy.h" | 8 #include "chrome/test/automation/browser_proxy.h" |
9 #include "chrome/test/ui/ui_test.h" | 9 #include "chrome/test/ui/ui_test.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 | 208 |
209 ASSERT_TRUE(tab_->GoBack()); | 209 ASSERT_TRUE(tab_->GoBack()); |
210 EXPECT_EQ(L"bot2", GetTabTitle()); | 210 EXPECT_EQ(L"bot2", GetTabTitle()); |
211 EXPECT_EQ(frames, GetTabURL()); | 211 EXPECT_EQ(frames, GetTabURL()); |
212 | 212 |
213 ASSERT_TRUE(tab_->GoBack()); | 213 ASSERT_TRUE(tab_->GoBack()); |
214 EXPECT_EQ(L"bot1", GetTabTitle()); | 214 EXPECT_EQ(L"bot1", GetTabTitle()); |
215 EXPECT_EQ(frames, GetTabURL()); | 215 EXPECT_EQ(frames, GetTabURL()); |
216 } | 216 } |
217 | 217 |
218 #if defined(OS_WIN) | |
219 // See http://crbug.com/61619 | 218 // See http://crbug.com/61619 |
220 #define MAYBE_FrameFormBackForward FLAKY_FrameFormBackForward | |
221 #else | |
222 #define MAYBE_FrameFormBackForward FrameFormBackForward | |
223 #endif | |
224 | |
225 // Test that back/forward preserves POST data and document state in subframes. | 219 // Test that back/forward preserves POST data and document state in subframes. |
226 TEST_F(SessionHistoryTest, MAYBE_FrameFormBackForward) { | 220 TEST_F(SessionHistoryTest, FLAKY_FrameFormBackForward) { |
227 ASSERT_TRUE(test_server_.Start()); | 221 ASSERT_TRUE(test_server_.Start()); |
228 | 222 |
229 // about:blank should be loaded first. | 223 // about:blank should be loaded first. |
230 ASSERT_FALSE(tab_->GoBack()); | 224 ASSERT_FALSE(tab_->GoBack()); |
231 EXPECT_EQ(L"", GetTabTitle()); | 225 EXPECT_EQ(L"", GetTabTitle()); |
232 | 226 |
233 GURL frames(test_server_.GetURL("files/session_history/frames.html")); | 227 GURL frames(test_server_.GetURL("files/session_history/frames.html")); |
234 ASSERT_TRUE(tab_->NavigateToURL(frames)); | 228 ASSERT_TRUE(tab_->NavigateToURL(frames)); |
235 EXPECT_EQ(L"bot1", GetTabTitle()); | 229 EXPECT_EQ(L"bot1", GetTabTitle()); |
236 | 230 |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 ASSERT_TRUE(tab_->GoBack()); | 558 ASSERT_TRUE(tab_->GoBack()); |
565 | 559 |
566 // Ensure history.length is properly truncated. | 560 // Ensure history.length is properly truncated. |
567 ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html"))); | 561 ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html"))); |
568 ASSERT_TRUE(tab_->ExecuteAndExtractInt( | 562 ASSERT_TRUE(tab_->ExecuteAndExtractInt( |
569 L"", L"domAutomationController.send(history.length)", &length)); | 563 L"", L"domAutomationController.send(history.length)", &length)); |
570 EXPECT_EQ(2, length); | 564 EXPECT_EQ(2, length); |
571 } | 565 } |
572 | 566 |
573 } // namespace | 567 } // namespace |
OLD | NEW |