| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/automation_proxy.h" | 7 #include "chrome/test/automation/automation_proxy.h" |
| 8 #include "chrome/test/automation/browser_proxy.h" | 8 #include "chrome/test/automation/browser_proxy.h" |
| 9 #include "chrome/test/automation/tab_proxy.h" | 9 #include "chrome/test/automation/tab_proxy.h" |
| 10 #include "chrome/test/ui/ui_test.h" | 10 #include "chrome/test/ui/ui_test.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 return url; | 73 return url; |
| 74 } | 74 } |
| 75 | 75 |
| 76 protected: | 76 protected: |
| 77 scoped_refptr<BrowserProxy> window_; | 77 scoped_refptr<BrowserProxy> window_; |
| 78 scoped_refptr<TabProxy> tab_; | 78 scoped_refptr<TabProxy> tab_; |
| 79 | 79 |
| 80 net::TestServer test_server_; | 80 net::TestServer test_server_; |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 #if defined(OS_WIN) | 83 #if defined(OS_WIN) || defined(OS_MACOSX) |
| 84 // See http://crbug.com/61619 | 84 // See http://crbug.com/61619 on windows. |
| 85 // See http://crbug.com/102094 on mac. |
| 85 #define MAYBE_BasicBackForward FLAKY_BasicBackForward | 86 #define MAYBE_BasicBackForward FLAKY_BasicBackForward |
| 86 #else | 87 #else |
| 87 #define MAYBE_BasicBackForward BasicBackForward | 88 #define MAYBE_BasicBackForward BasicBackForward |
| 88 #endif | 89 #endif |
| 89 | 90 |
| 90 TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) { | 91 TEST_F(SessionHistoryTest, MAYBE_BasicBackForward) { |
| 91 ASSERT_TRUE(test_server_.Start()); | 92 ASSERT_TRUE(test_server_.Start()); |
| 92 | 93 |
| 93 // about:blank should be loaded first. | 94 // about:blank should be loaded first. |
| 94 ASSERT_FALSE(tab_->GoBack()); | 95 ASSERT_FALSE(tab_->GoBack()); |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 ASSERT_TRUE(tab_->GoBack()); | 560 ASSERT_TRUE(tab_->GoBack()); |
| 560 | 561 |
| 561 // Ensure history.length is properly truncated. | 562 // Ensure history.length is properly truncated. |
| 562 ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html"))); | 563 ASSERT_TRUE(tab_->NavigateToURL(test_server_.GetURL("files/title2.html"))); |
| 563 ASSERT_TRUE(tab_->ExecuteAndExtractInt( | 564 ASSERT_TRUE(tab_->ExecuteAndExtractInt( |
| 564 L"", L"domAutomationController.send(history.length)", &length)); | 565 L"", L"domAutomationController.send(history.length)", &length)); |
| 565 EXPECT_EQ(2, length); | 566 EXPECT_EQ(2, length); |
| 566 } | 567 } |
| 567 | 568 |
| 568 } // namespace | 569 } // namespace |
| OLD | NEW |