| Index: content/browser/web_contents/web_contents_impl_browsertest.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| index 792b4eef5fba4f352d6bb814f16ede92f148fd31..bf69ab3095a93fa514483e0752aa2b75dacca8a4 100644
|
| --- a/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
|
| @@ -3,13 +3,13 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/values.h"
|
| -#include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| #include "content/public/browser/load_notification_details.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/notification_details.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_types.h"
|
| +#include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| @@ -229,45 +229,6 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
|
| shell()->web_contents()->GetVisibleURL());
|
| }
|
|
|
| -// Test that the browser receives the proper frame attach/detach messages from
|
| -// the renderer and builds proper frame tree.
|
| -IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, FrameTree) {
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| -
|
| - NavigateToURL(shell(),
|
| - embedded_test_server()->GetURL("/frame_tree/top.html"));
|
| -
|
| - WebContentsImpl* wc = static_cast<WebContentsImpl*>(shell()->web_contents());
|
| - RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
|
| - wc->GetRenderViewHost());
|
| - FrameTreeNode* root = wc->GetFrameTreeRootForTesting();
|
| -
|
| - // Check that the root node is properly created with the frame id of the
|
| - // initial navigation.
|
| - EXPECT_EQ(3UL, root->child_count());
|
| - EXPECT_EQ(std::string(), root->frame_name());
|
| - EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
|
| -
|
| - EXPECT_EQ(2UL, root->child_at(0)->child_count());
|
| - EXPECT_STREQ("1-1-name", root->child_at(0)->frame_name().c_str());
|
| -
|
| - // Verify the deepest node exists and has the right name.
|
| - EXPECT_EQ(2UL, root->child_at(2)->child_count());
|
| - EXPECT_EQ(1UL, root->child_at(2)->child_at(1)->child_count());
|
| - EXPECT_EQ(0UL, root->child_at(2)->child_at(1)->child_at(0)->child_count());
|
| - EXPECT_STREQ("3-1-id",
|
| - root->child_at(2)->child_at(1)->child_at(0)->frame_name().c_str());
|
| -
|
| - // Navigate to about:blank, which should leave only the root node of the frame
|
| - // tree in the browser process.
|
| - NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
|
| -
|
| - root = wc->GetFrameTreeRootForTesting();
|
| - EXPECT_EQ(0UL, root->child_count());
|
| - EXPECT_EQ(std::string(), root->frame_name());
|
| - EXPECT_EQ(rvh->main_frame_id(), root->frame_id());
|
| -}
|
| -
|
| // TODO(sail): enable this for MAC when auto resizing of WebContentsViewCocoa is
|
| // fixed.
|
| // TODO(shrikant): enable this for Windows when issue with
|
|
|