diff options
Diffstat (limited to 'chrome')
18 files changed, 317 insertions, 33 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index d6d1767..ead11b8 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -775,6 +775,8 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { OnMsgDOMUISend) IPC_MESSAGE_HANDLER(ViewHostMsg_ForwardMessageToExternalHost, OnMsgForwardMessageToExternalHost) + IPC_MESSAGE_HANDLER(ViewHostMsg_DocumentLoadedInFrame, + OnMsgDocumentLoadedInFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnMsgGoToEntryAtOffset) IPC_MESSAGE_HANDLER(ViewHostMsg_SetTooltipText, OnMsgSetTooltipText) @@ -1152,6 +1154,10 @@ void RenderViewHost::OnMsgForwardMessageToExternalHost( delegate_->ProcessExternalHostMessage(message, origin, target); } +void RenderViewHost::OnMsgDocumentLoadedInFrame() { + delegate_->DocumentLoadedInFrame(); +} + void RenderViewHost::DisassociateFromPopupCount() { Send(new ViewMsg_DisassociateFromPopupCount(routing_id())); } diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 67d8347..a14af37 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -499,6 +499,7 @@ class RenderViewHost : public RenderWidgetHost { void OnMsgForwardMessageToExternalHost(const std::string& message, const std::string& origin, const std::string& target); + void OnMsgDocumentLoadedInFrame(); void OnMsgGoToEntryAtOffset(int offset); void OnMsgSetTooltipText(const std::wstring& tooltip_text); void OnMsgSelectionChanged(const std::string& text); diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index dbf29eb..8b55cb1 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -288,6 +288,10 @@ class RenderViewHostDelegate { const std::string& target) { } + // A document has been loaded in a frame. + virtual void DocumentLoadedInFrame() { + } + // Navigate to the history entry for the given offset from the current // position within the NavigationController. Makes no change if offset is // not valid. diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index eb6441a..b5ae80b 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -90,6 +90,12 @@ bool AreURLsInPageNavigation(const GURL& existing_url, const GURL& new_url) { new_url.ReplaceComponents(replacements); } +// Navigation within this limit since the last document load is considered to +// be automatic (i.e., machine-initiated) rather than user-initiated unless +// a user gesture has been observed. +const base::TimeDelta kMaxAutoNavigationTimeDelta = + base::TimeDelta::FromSeconds(5); + } // namespace // NavigationController --------------------------------------------------- @@ -424,6 +430,14 @@ const SkBitmap& NavigationController::GetLazyFavIcon() const { } } +void NavigationController::DocumentLoadedInFrame() { + last_document_loaded_ = base::TimeTicks::Now(); +} + +void NavigationController::OnUserGesture() { + user_gesture_observed_ = true; +} + bool NavigationController::RendererDidNavigate( const ViewHostMsg_FrameNavigate_Params& params, LoadCommittedDetails* details) { @@ -505,6 +519,8 @@ bool NavigationController::RendererDidNavigate( details->http_status_code = params.http_status_code; NotifyNavigationEntryCommitted(details); + user_gesture_observed_ = false; + return true; } @@ -585,6 +601,21 @@ NavigationType::Type NavigationController::ClassifyNavigation( return NavigationType::EXISTING_PAGE; } +bool NavigationController::IsRedirect( + const ViewHostMsg_FrameNavigate_Params& params) { + // For main frame transition, we judge by params.transition. + // Otherwise, by params.redirects. + if (PageTransition::IsMainFrame(params.transition)) { + return PageTransition::IsRedirect(params.transition); + } + return params.redirects.size() > 1; +} + +bool NavigationController::IsLikelyAutoNavigation(base::TimeTicks now) { + return !user_gesture_observed_ && + (now - last_document_loaded_) < kMaxAutoNavigationTimeDelta; +} + void NavigationController::RendererDidNavigateToNewPage( const ViewHostMsg_FrameNavigate_Params& params) { NavigationEntry* new_entry; @@ -611,11 +642,14 @@ void NavigationController::RendererDidNavigateToNewPage( new_entry->set_site_instance(tab_contents_->GetSiteInstance()); new_entry->set_has_post_data(params.is_post); - // If the current entry is a redirection source, it needs to be replaced with - // the new entry to avoid unwanted redirections in navigating backward / - // forward. Otherwise, just insert the new entry. + // If the current entry is a redirection source and the redirection has + // occurred within kMaxAutoNavigationTimeDelta since the last document load, + // this is likely to be machine-initiated redirect and the entry needs to be + // replaced with the new entry to avoid unwanted redirections in navigating + // backward/forward. + // Otherwise, just insert the new entry. InsertOrReplaceEntry(new_entry, - PageTransition::IsRedirect(new_entry->transition_type())); + IsRedirect(params) && IsLikelyAutoNavigation(base::TimeTicks::Now())); } void NavigationController::RendererDidNavigateToExistingPage( @@ -687,11 +721,22 @@ void NavigationController::RendererDidNavigateInPage( NavigationEntry* new_entry = new NavigationEntry(*existing_entry); new_entry->set_page_id(params.page_id); new_entry->set_url(params.url); - InsertOrReplaceEntry(new_entry, false); + InsertOrReplaceEntry(new_entry, + IsRedirect(params) && IsLikelyAutoNavigation(base::TimeTicks::Now())); } void NavigationController::RendererDidNavigateNewSubframe( const ViewHostMsg_FrameNavigate_Params& params) { + if (PageTransition::StripQualifier(params.transition) == + PageTransition::AUTO_SUBFRAME) { + // This is not user-initiated. Ignore. + return; + } + if (IsRedirect(params)) { + // This is redirect. Ignore. + return; + } + // Manual subframe navigations just get the current entry cloned so the user // can go back or forward to it. The actual subframe information will be // stored in the page state for each of those entries. This happens out of diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index 5a7fba9..8419e0b 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -11,6 +11,7 @@ #include "base/linked_ptr.h" #include "base/string16.h" +#include "base/time.h" #include "googleurl/src/gurl.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ssl/ssl_manager.h" @@ -288,6 +289,12 @@ class NavigationController { return tab_contents_; } + // Called when a document has been loaded in a frame. + void DocumentLoadedInFrame(); + + // Called when the user presses the mouse, enter key or space bar. + void OnUserGesture(); + // For use by TabContents ---------------------------------------------------- // Handles updating the navigation state after the renderer has navigated. @@ -432,6 +439,13 @@ class NavigationController { // Discards the transient entry. void DiscardTransientEntry(); + // Returns true if the navigation is redirect. + bool IsRedirect(const ViewHostMsg_FrameNavigate_Params& params); + + // Returns true if the navigation is likley to be automatic rather than + // user-initiated. + bool IsLikelyAutoNavigation(base::TimeTicks now); + // --------------------------------------------------------------------------- // The user profile associated with this controller @@ -491,6 +505,12 @@ class NavigationController { // Unique identifier of the window we're in. Used by session restore. SessionID window_id_; + // The time ticks at which the last document was loaded. + base::TimeTicks last_document_loaded_; + + // Whether a user gesture has been observed since the last navigation. + bool user_gesture_observed_; + // Should Reload check for post data? The default is true, but is set to false // when testing. static bool check_for_repost_; diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 0380c2b..2d6d997 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -1841,6 +1841,10 @@ void TabContents::ProcessDOMUIMessage(const std::string& message, render_manager_.dom_ui()->ProcessDOMUIMessage(message, content); } +void TabContents::DocumentLoadedInFrame() { + controller_.DocumentLoadedInFrame(); +} + void TabContents::ProcessExternalHostMessage(const std::string& message, const std::string& origin, const std::string& target) { @@ -2177,6 +2181,7 @@ void TabContents::OnUserGesture() { if (drm) drm->OnUserGesture(this); #endif + controller_.OnUserGesture(); } void TabContents::OnFindReply(int request_id, diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index c344a8a..ddf42b5 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -783,6 +783,7 @@ class TabContents : public PageNavigator, int automation_id); virtual void ProcessDOMUIMessage(const std::string& message, const std::string& content); + virtual void DocumentLoadedInFrame(); virtual void ProcessExternalHostMessage(const std::string& message, const std::string& origin, const std::string& target); diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 9904bd0..f7ba56c 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -687,6 +687,9 @@ IPC_BEGIN_MESSAGES(ViewHost) int32 /* page_id */, std::string /* state */) + // Notifies the browser that a document has been loaded in a frame. + IPC_MESSAGE_ROUTED0(ViewHostMsg_DocumentLoadedInFrame) + // Changes the title for the page in the UI when the page is navigated or the // title changes. // TODO(darin): use a UTF-8 string to reduce data size diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index b6d29a2..b92cd53 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1272,6 +1272,8 @@ void RenderView::DidFailLoadWithError(WebView* webview, void RenderView::DidFinishDocumentLoadForFrame(WebView* webview, WebFrame* frame) { + Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_)); + // The document has now been fully loaded. Scan for password forms to be // sent up to the browser. SendPasswordForms(frame); diff --git a/chrome/test/data/History/history_length_test_page_1.html b/chrome/test/data/History/history_length_test_page_1.html index b0bfdaf..34fa74b 100644 --- a/chrome/test/data/History/history_length_test_page_1.html +++ b/chrome/test/data/History/history_length_test_page_1.html @@ -13,17 +13,18 @@ History Test Page 1.... function onLoad() { if (readCookie(navigate_backward_cookie) != null) { - setTimeout(OnNavigateBackward, 100); + setTimeout(OnNavigateBackward, 50); return true; } - setTimeout(OnInitialLoad, 100); + setTimeout(OnInitialLoad, 50); return true; } function OnNavigateBackward() { if (window.history.length != 2) { onFailure("History_Length_Test_3", 1, - "History length mismatch on navigate backward at page 1"); + "History length mismatch on navigate backward at page 1: " + + window.history.length); return false; } // Navigate forward from this point on. @@ -35,7 +36,8 @@ function OnNavigateBackward() { function OnInitialLoad() { if (window.history.length != 2) { onFailure("History_Length_Test_1", 1, - "History length mismatch on initial load at page 1"); + "History length mismatch on initial load at page 1: " + + window.history.length); return false; } onSuccess("History_Length_Test_1", 1); diff --git a/chrome/test/data/History/history_length_test_page_11.html b/chrome/test/data/History/history_length_test_page_11.html new file mode 100644 index 0000000..8e2d4ba --- /dev/null +++ b/chrome/test/data/History/history_length_test_page_11.html @@ -0,0 +1,35 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><title>History Test Page 11</title> +<script type="text/javascript" src="HistoryHelper.js"></script> +</head> + +<body onload="onLoad();"> +<div id="statusPanel" style="border: 1px solid red; width: 100%"> +History Test Page 11.... +</div> +</body> + +<script type="text/javascript"> + +function onLoad() { + setTimeout(OnInitialLoad, 50); + return true; +} + +function OnInitialLoad() { + if (window.history.length != 2) { + onFailure("History_Length_Test_11", 1, + "History length mismatch on initial load at page 11: " + + window.history.length); + return false; + } + onSuccess("History_Length_Test_11", 1); + return true; +} + +function redirectToPage12() { + window.location.href = "history_length_test_page_12.html"; +} + +</script> +</html> diff --git a/chrome/test/data/History/history_length_test_page_12.html b/chrome/test/data/History/history_length_test_page_12.html new file mode 100644 index 0000000..65c8171 --- /dev/null +++ b/chrome/test/data/History/history_length_test_page_12.html @@ -0,0 +1,31 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><title>History Test Page 12</title> +<script type="text/javascript" src="HistoryHelper.js"></script> +</head> + +<body onload="onLoad();"> +<div id="statusPanel" style="border: 1px solid red; width: 100%"> +History Test Page 12.... +</div> +</body> + +<script type="text/javascript"> + +function onLoad() { + setTimeout(OnInitialLoad, 50); + return true; +} + +function OnInitialLoad() { + if (window.history.length != 3) { + onFailure("History_Length_Test_12", 1, + "History length mismatch on initial load at page 12: " + + window.history.length); + return false; + } + onSuccess("History_Length_Test_12", 1); + return true; +} + +</script> +</html> diff --git a/chrome/test/data/History/history_length_test_page_2.html b/chrome/test/data/History/history_length_test_page_2.html index edcecfe..b40912e 100644 --- a/chrome/test/data/History/history_length_test_page_2.html +++ b/chrome/test/data/History/history_length_test_page_2.html @@ -18,19 +18,20 @@ function onLoad() { "Page 2 must not be visited in navigating backward/forward"); return false; } - setTimeout(OnInitialLoad, 100); + setTimeout(OnInitialLoad, 50); return true; } function OnInitialLoad() { if (window.history.length != 3) { onFailure("History_Length_Test_2", 1, - "History length mismatch on initial load at page 2"); + "History length mismatch on initial load at page 2: " + + window.history.length); return false; } // Redirect to page 3. window.location.href = "history_length_test_page_3.html"; - return true; + return true; } </script> diff --git a/chrome/test/data/History/history_length_test_page_21.html b/chrome/test/data/History/history_length_test_page_21.html new file mode 100644 index 0000000..f9a14c1 --- /dev/null +++ b/chrome/test/data/History/history_length_test_page_21.html @@ -0,0 +1,33 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><title>History Test Page 21</title> +<script type="text/javascript" src="HistoryHelper.js"></script> +</head> + +<body onload="onLoad();"> +<div id="statusPanel" style="border: 1px solid red; width: 100%"> +History Test Page 21.... +</div> +</body> + +<script type="text/javascript"> + +function onLoad() { + // Move to page 22 after 6 sec, to mimic user-initiated navigation. + setTimeout(OnInitialLoad, 6000); + return true; +} + +function OnInitialLoad() { + if (window.history.length != 2) { + onFailure("History_Length_Test_21", 1, + "History length mismatch on initial load at page 21: " + + window.history.length); + return false; + } + // Redirect to page 22. + window.location.href = "history_length_test_page_22.html"; + return true; +} + +</script> +</html>
\ No newline at end of file diff --git a/chrome/test/data/History/history_length_test_page_22.html b/chrome/test/data/History/history_length_test_page_22.html new file mode 100644 index 0000000..8b4ed67 --- /dev/null +++ b/chrome/test/data/History/history_length_test_page_22.html @@ -0,0 +1,31 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><title>History Test Page 22</title> +<script type="text/javascript" src="HistoryHelper.js"></script> +</head> + +<body onload="onLoad();"> +<div id="statusPanel" style="border: 1px solid red; width: 100%"> +History Test Page 22.... +</div> +</body> + +<script type="text/javascript"> + +function onLoad() { + setTimeout(OnInitialLoad, 50); + return true; +} + +function OnInitialLoad() { + if (window.history.length != 3) { + onFailure("History_Length_Test_21", 1, + "History length mismatch on initial load at page 22: " + + window.history.length); + return false; + } + onSuccess("History_Length_Test_21", 1); + return true; +} + +</script> +</html>
\ No newline at end of file diff --git a/chrome/test/data/History/history_length_test_page_3.html b/chrome/test/data/History/history_length_test_page_3.html index 4c9a0a0..32de5aa 100644 --- a/chrome/test/data/History/history_length_test_page_3.html +++ b/chrome/test/data/History/history_length_test_page_3.html @@ -1,6 +1,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head><title>History Test Page 3</title> -<script src="HistoryHelper.js"></script> +<script type="text/javascript" src="HistoryHelper.js"></script> </head> <body onload="onLoad();"> @@ -13,45 +13,48 @@ History Test Page 3.... function onLoad() { if (readCookie(navigate_forward_cookie) != null) { - setTimeout(OnNavigateForward, 100); + setTimeout(OnNavigateForward, 50); return true; } - if (readCookie(navigate_backward_cookie)) { - setTimeout(OnNavigateBackward, 100); + if (readCookie(navigate_backward_cookie) != null) { + setTimeout(OnNavigateBackward, 50); return true; } - setTimeout(OnInitialLoad, 100); + setTimeout(OnInitialLoad, 50); return true; } function OnInitialLoad() { if (window.history.length != 3) { onFailure("History_Length_Test_2", 1, - "History length mismatch on initial load at page 3"); + "History length mismatch on initial load at page 3: " + + window.history.length); return false; } onSuccess("History_Length_Test_2", 1); - return true; + return true; } function OnNavigateBackward() { if (window.history.length != 3) { onFailure("History_Length_Test_3", 1, - "History length mismatch on navigating backward at page 3"); + "History length mismatch on navigating backward at page 3: " + + window.history.length); return false; } window.history.back(); - return true; + return true; } function OnNavigateForward() { if (window.history.length != 3) { onFailure("History_Length_Test_3", 1, - "History length mismatch on navigating forward at page 3"); + "History length mismatch on navigating forward at page 3: " + + window.history.length); return false; } window.history.forward(); - return true; + return true; } </script> diff --git a/chrome/test/data/History/history_length_test_page_4.html b/chrome/test/data/History/history_length_test_page_4.html index a72889c..3e6b8a0 100644 --- a/chrome/test/data/History/history_length_test_page_4.html +++ b/chrome/test/data/History/history_length_test_page_4.html @@ -1,6 +1,6 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head><title>History Test Page 4</title> -<script src="HistoryHelper.js"></script> +<script type="text/javascript" src="HistoryHelper.js"></script> </head> <body onload="onLoad();"> @@ -9,33 +9,35 @@ History Test Page 4.... </div> </body> -<SCRIPT type="text/javascript"> +<script type="text/javascript"> function onLoad() { if (readCookie(navigate_forward_cookie) != null) { - setTimeout(OnNavigateForward, 100); + setTimeout(OnNavigateForward, 50); return true; } - setTimeout(OnInitialLoad, 100); + setTimeout(OnInitialLoad, 50); return true; } function OnInitialLoad() { if (window.history.length != 4) { onFailure("History_Length_Test_3", 1, - "History length mismatch on initial load at page 4"); + "History length mismatch on initial load at page 4: " + + window.history.length); return false; } // Navigate backward from this point on. createCookie(navigate_backward_cookie, "1", "1"); window.history.back(); - return true; + return true; } function OnNavigateForward() { if (window.history.length != 4) { onFailure("History_Length_Test_3", 1, - "History length mismatch on navigating forward at page 4"); + "History length mismatch on navigating forward at page 4: " + + window.history.length); return false; } eraseCookie(navigate_forward_cookie); @@ -44,5 +46,5 @@ function OnNavigateForward() { return true; } -</SCRIPT> +</script> </html>
\ No newline at end of file diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc index 11be6ff..e2ba8a4 100644 --- a/chrome/test/ui/history_uitest.cc +++ b/chrome/test/ui/history_uitest.cc @@ -30,10 +30,16 @@ // History UI tests #include "base/file_util.h" +#include "base/gfx/point.h" +#include "base/gfx/rect.h" +#include "chrome/browser/view_ids.h" #include "chrome/common/chrome_paths.h" +#include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" +#include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" #include "net/base/net_util.h" +#include "views/event.h" const char kTestCompleteCookie[] = "status"; const char kTestCompleteSuccess[] = "OK"; @@ -48,7 +54,11 @@ class HistoryTester : public UITest { } }; -TEST_F(HistoryTester, VerifyHistoryLength) { +// TODO(yuzo): Fix the following flaky (hence disabled) tests. +// These tests are flaky because automatic and user-initiated transitions are +// distinguished based on the interval between page load and redirect. + +TEST_F(HistoryTester, DISABLED_VerifyHistoryLength) { // Test the history length for the following page transitions. // // Test case 1: @@ -66,7 +76,7 @@ TEST_F(HistoryTester, VerifyHistoryLength) { GURL url_1 = GetTestUrl(L"History", test_case_1); NavigateToURL(url_1); WaitForFinish("History_Length_Test_1", "1", url_1, kTestCompleteCookie, - kTestCompleteSuccess, action_max_timeout_ms()); + kTestCompleteSuccess, action_max_timeout_ms()); // Test case 2 std::wstring test_case_2 = L"history_length_test_page_2.html"; @@ -82,3 +92,52 @@ TEST_F(HistoryTester, VerifyHistoryLength) { WaitForFinish("History_Length_Test_3", "1", url_3, kTestCompleteCookie, kTestCompleteSuccess, action_max_timeout_ms()); } + +#if defined(OS_WIN) +// This test requires simulated mouse click, which is possible only for Windows. +TEST_F(HistoryTester, DISABLED_ConsiderRedirectAfterGestureAsUserInitiated) { + // Test the history length for the following page transition. + // + // -open-> Page 11 -slow_redirect-> Page 12. + // + // If redirect occurs after a user gesture, e.g., mouse click, the + // redirect is more likely to be user-initiated rather than automatic. + // Therefore, Page 11 should be in the history in addition to Page 12. + + std::wstring test_case = L"history_length_test_page_11.html"; + GURL url = GetTestUrl(L"History", test_case); + NavigateToURL(url); + WaitForFinish("History_Length_Test_11", "1", url, kTestCompleteCookie, + kTestCompleteSuccess, action_max_timeout_ms()); + + // Simulate click. This only works for Windows. + scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0); + scoped_refptr<WindowProxy> window = browser->GetWindow(); + gfx::Rect tab_view_bounds; + ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &tab_view_bounds, + true)); + POINT point(tab_view_bounds.CenterPoint().ToPOINT()); + ASSERT_TRUE( + window->SimulateOSClick(point, views::Event::EF_LEFT_BUTTON_DOWN)); + + NavigateToURL(GURL("javascript:redirectToPage12()")); + WaitForFinish("History_Length_Test_12", "1", url, kTestCompleteCookie, + kTestCompleteSuccess, action_max_timeout_ms()); +} +#endif // defined(OS_WIN) + +TEST_F(HistoryTester, DISABLED_ConsiderSlowRedirectAsUserInitiated) { + // Test the history length for the following page transition. + // + // -open-> Page 21 -redirect-> Page 22. + // + // If redirect occurs more than 5 seconds later after the page is loaded, + // the redirect is likely to be user-initiated. + // Therefore, Page 21 should be in the history in addition to Page 22. + + std::wstring test_case = L"history_length_test_page_21.html"; + GURL url = GetTestUrl(L"History", test_case); + NavigateToURL(url); + WaitForFinish("History_Length_Test_21", "1", url, kTestCompleteCookie, + kTestCompleteSuccess, action_max_timeout_ms()); +} |