diff options
| author | vkuzkokov <vkuzkokov@chromium.org> | 2015-04-28 05:07:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 12:07:04 +0000 |
| commit | 49180eb13549e440bbd4f66390e32e84699dcdfd (patch) | |
| tree | ea34e50a0a150f491d6cfa5cebcc8f7600628885 /content/browser/devtools/devtools_manager_unittest.cc | |
| parent | ee9049e5b2e4ddd2c896ba9c9d991b2d59a00977 (diff) | |
| download | chromium_src-49180eb13549e440bbd4f66390e32e84699dcdfd.zip chromium_src-49180eb13549e440bbd4f66390e32e84699dcdfd.tar.gz chromium_src-49180eb13549e440bbd4f66390e32e84699dcdfd.tar.bz2 | |
Revert of Classify navigations without page id in parallel to the existing classifier. (patchset #35 id:680001 of https://codereview.chromium.org/1002803002/)
Reason for revert:
Very flaky on ChromeOS debug bots. See crbug.com/481910
Original issue's description:
> Classify navigations without page id in parallel to the existing classifier.
>
> For now, this only happens in debug builds.
>
> BUG=369661
> TEST=NavigationControllerBrowserTest.NavigationTypeClassification_*
> TEST=Every other test on the planet.
>
> Committed: https://crrev.com/d8d93348bbd8c646c337bdaa40fc0c64204fc5ff
> Cr-Commit-Position: refs/heads/master@{#327122}
>
> Reverted: https://crrev.com/5348e920f4119aff9a4eb76c0965725dc85a66cc
> Cr-Revert-Position: refs/heads/master@{#327152}
>
> Committed: https://crrev.com/5671403d44971669e4d81aecf3f002188ce0e95f
> Cr-Commit-Position: refs/heads/master@{#327214}
TBR=phajdan.jr@chromium.org,clamy@chromium.org,creis@chromium.org,hajimehoshi@chromium.org,isherman@chromium.org,jeremyim@chromium.org,mattm@chromium.org,mnaganov@chromium.org,mvanouwerkerk@chromium.org,nasko@chromium.org,stevenjb@chromium.org,bengr@chromium.org,cpu@chromium.org,avi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=369661
Review URL: https://codereview.chromium.org/1110943003
Cr-Commit-Position: refs/heads/master@{#327269}
Diffstat (limited to 'content/browser/devtools/devtools_manager_unittest.cc')
| -rw-r--r-- | content/browser/devtools/devtools_manager_unittest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index 7dcb3a7..5231d5e 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -251,10 +251,9 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) { const GURL url("http://www.google.com"); controller().LoadURL( url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); - int pending_id = controller().GetPendingEntry()->GetUniqueID(); contents()->GetMainFrame()->PrepareForCommit(); - contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, true, - url, ui::PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate( + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->CrossProcessNavigationPending()); TestDevToolsClientHost client_host; @@ -273,10 +272,9 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) { // Interrupt pending navigation and navigate back to the original site. controller().LoadURL( url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); - pending_id = controller().GetPendingEntry()->GetUniqueID(); contents()->GetMainFrame()->PrepareForCommit(); - contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, false, - url, ui::PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate( + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->CrossProcessNavigationPending()); EXPECT_EQ(client_host.agent_host(), DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); |