diff options
| author | avi <avi@chromium.org> | 2015-05-07 14:12:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-07 21:13:17 +0000 |
| commit | 61cae85448cfeb793270e804b5ad1023993279c5 (patch) | |
| tree | 9efa2e75d7d4baccab662463ab4e4daddf87c698 /content/browser/devtools/devtools_manager_unittest.cc | |
| parent | b7009f91fe2c7f2989cd5fbf4a1866e7892ee1db (diff) | |
| download | chromium_src-61cae85448cfeb793270e804b5ad1023993279c5.zip chromium_src-61cae85448cfeb793270e804b5ad1023993279c5.tar.gz chromium_src-61cae85448cfeb793270e804b5ad1023993279c5.tar.bz2 | |
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}
Reverted: https://crrev.com/49180eb13549e440bbd4f66390e32e84699dcdfd
Cr-Revert-Position: refs/heads/master@{#327269}
Committed: https://crrev.com/a038c6670f450313a8e224ccc5d05dd59e3488c4
Cr-Commit-Position: refs/heads/master@{#328131}
Reverted: https://crrev.com/1f5d6196b8d53e70e7a7a2276cdf3481365e7e04
Cr-Revert-Position: refs/heads/master@{#328282}
Review URL: https://codereview.chromium.org/1002803002
Cr-Commit-Position: refs/heads/master@{#328829}
Diffstat (limited to 'content/browser/devtools/devtools_manager_unittest.cc')
| -rw-r--r-- | content/browser/devtools/devtools_manager_unittest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc index 0e0ba3f..cd632c1 100644 --- a/content/browser/devtools/devtools_manager_unittest.cc +++ b/content/browser/devtools/devtools_manager_unittest.cc @@ -167,9 +167,10 @@ 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, url, ui::PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, true, + url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->CrossProcessNavigationPending()); TestDevToolsClientHost client_host; @@ -188,9 +189,10 @@ 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, url, ui::PAGE_TRANSITION_TYPED); + contents()->TestDidNavigate(contents()->GetMainFrame(), 1, pending_id, false, + url, ui::PAGE_TRANSITION_TYPED); EXPECT_FALSE(contents()->CrossProcessNavigationPending()); EXPECT_EQ(client_host.agent_host(), DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); |