Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: content/browser/frame_host/frame_tree_unittest.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Charlie's latest review. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/frame_tree_unittest.cc
diff --git a/content/browser/frame_host/frame_tree_unittest.cc b/content/browser/frame_host/frame_tree_unittest.cc
index ebdf3118fcf1bf34eb918518a6f5c2b74f134a69..6f1bb3303805386ad0aa7a5c112fa2960ca39b7d 100644
--- a/content/browser/frame_host/frame_tree_unittest.cc
+++ b/content/browser/frame_host/frame_tree_unittest.cc
@@ -110,6 +110,7 @@ TEST_F(FrameTreeTest, Shape) {
RenderFrameHostFactory::Create(static_cast<RenderViewHostImpl*>(rvh()),
NULL,
&frame_tree,
+ frame_tree.root(),
process()->GetNextRoutingID(),
false);
frame_tree.SwapMainFrame(render_frame_host.get());
@@ -151,7 +152,7 @@ TEST_F(FrameTreeTest, Shape) {
GetTreeState(&frame_tree));
// Test removing of nodes.
- frame_tree.RemoveFrame(555, 655);
+ frame_tree.RemoveFrame(NULL, 555, 655);
ASSERT_EQ("5: [14: [244: [], 245: []], "
"15: [255 'no children node': []], "
"16: [264: [], 265: [], 266: [], "
@@ -159,7 +160,7 @@ TEST_F(FrameTreeTest, Shape) {
"[365: [455: [555: []]]], 268: []]]",
GetTreeState(&frame_tree));
- frame_tree.RemoveFrame(16, 265);
+ frame_tree.RemoveFrame(NULL, 16, 265);
ASSERT_EQ("5: [14: [244: [], 245: []], "
"15: [255 'no children node': []], "
"16: [264: [], 266: [], "
@@ -167,7 +168,7 @@ TEST_F(FrameTreeTest, Shape) {
"[365: [455: [555: []]]], 268: []]]",
GetTreeState(&frame_tree));
- frame_tree.RemoveFrame(5, 15);
+ frame_tree.RemoveFrame(NULL, 5, 15);
ASSERT_EQ("5: [14: [244: [], 245: []], "
"16: [264: [], 266: [], "
"267 'node with deep subtree': "
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/navigation_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698