| OLD | NEW |
| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 // | 241 // |
| 242 // -open-> Page 11 -slow_redirect-> Page 12. | 242 // -open-> Page 11 -slow_redirect-> Page 12. |
| 243 // | 243 // |
| 244 // If redirect occurs after a user gesture, e.g., mouse click, the | 244 // If redirect occurs after a user gesture, e.g., mouse click, the |
| 245 // redirect is more likely to be user-initiated rather than automatic. | 245 // redirect is more likely to be user-initiated rather than automatic. |
| 246 // Therefore, Page 11 should be in the history in addition to Page 12. | 246 // Therefore, Page 11 should be in the history in addition to Page 12. |
| 247 LoadAndWaitForFile("history_length_test_page_11.html"); | 247 LoadAndWaitForFile("history_length_test_page_11.html"); |
| 248 | 248 |
| 249 content::SimulateMouseClick( | 249 content::SimulateMouseClick( |
| 250 browser()->tab_strip_model()->GetActiveWebContents(), 0, | 250 browser()->tab_strip_model()->GetActiveWebContents(), 0, |
| 251 WebKit::WebMouseEvent::ButtonLeft); | 251 blink::WebMouseEvent::ButtonLeft); |
| 252 LoadAndWaitForFile("history_length_test_page_11.html"); | 252 LoadAndWaitForFile("history_length_test_page_11.html"); |
| 253 } | 253 } |
| 254 | 254 |
| 255 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, | 255 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, |
| 256 ConsiderSlowRedirectAsUserInitiated) { | 256 ConsiderSlowRedirectAsUserInitiated) { |
| 257 // Test the history length for the following page transition. | 257 // Test the history length for the following page transition. |
| 258 // | 258 // |
| 259 // -open-> Page 21 -redirect-> Page 22. | 259 // -open-> Page 21 -redirect-> Page 22. |
| 260 // | 260 // |
| 261 // If redirect occurs more than 5 seconds later after the page is loaded, | 261 // If redirect occurs more than 5 seconds later after the page is loaded, |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 | 500 |
| 501 content::WebContents* active_web_contents = | 501 content::WebContents* active_web_contents = |
| 502 browser()->tab_strip_model()->GetActiveWebContents(); | 502 browser()->tab_strip_model()->GetActiveWebContents(); |
| 503 ASSERT_EQ(web_contents, active_web_contents); | 503 ASSERT_EQ(web_contents, active_web_contents); |
| 504 ASSERT_EQ(history_url, active_web_contents->GetURL()); | 504 ASSERT_EQ(history_url, active_web_contents->GetURL()); |
| 505 | 505 |
| 506 content::WebContents* second_tab = | 506 content::WebContents* second_tab = |
| 507 browser()->tab_strip_model()->GetWebContentsAt(1); | 507 browser()->tab_strip_model()->GetWebContentsAt(1); |
| 508 ASSERT_NE(history_url, second_tab->GetURL()); | 508 ASSERT_NE(history_url, second_tab->GetURL()); |
| 509 } | 509 } |
| OLD | NEW |