| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/frame_tree.h" | 5 #include "content/browser/frame_host/frame_tree.h" |
| 6 #include "content/browser/frame_host/frame_tree_node.h" | 6 #include "content/browser/frame_host/frame_tree_node.h" |
| 7 #include "content/browser/renderer_host/render_view_host_impl.h" | 7 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
| 9 #include "content/public/browser/notification_service.h" | 9 #include "content/public/browser/notification_service.h" |
| 10 #include "content/public/browser/notification_types.h" | 10 #include "content/public/browser/notification_types.h" |
| 11 #include "content/public/common/url_constants.h" | 11 #include "content/public/common/url_constants.h" |
| 12 #include "content/public/test/browser_test_utils.h" | 12 #include "content/public/test/browser_test_utils.h" |
| 13 #include "content/public/test/content_browser_test.h" |
| 14 #include "content/public/test/content_browser_test_utils.h" |
| 13 #include "content/public/test/test_navigation_observer.h" | 15 #include "content/public/test/test_navigation_observer.h" |
| 14 #include "content/public/test/test_utils.h" | 16 #include "content/public/test/test_utils.h" |
| 15 #include "content/shell/browser/shell.h" | 17 #include "content/shell/browser/shell.h" |
| 16 #include "content/test/content_browser_test.h" | |
| 17 #include "content/test/content_browser_test_utils.h" | |
| 18 #include "net/dns/mock_host_resolver.h" | 18 #include "net/dns/mock_host_resolver.h" |
| 19 | 19 |
| 20 namespace content { | 20 namespace content { |
| 21 | 21 |
| 22 class FrameTreeBrowserTest : public ContentBrowserTest { | 22 class FrameTreeBrowserTest : public ContentBrowserTest { |
| 23 public: | 23 public: |
| 24 FrameTreeBrowserTest() {} | 24 FrameTreeBrowserTest() {} |
| 25 | 25 |
| 26 private: | 26 private: |
| 27 DISALLOW_COPY_AND_ASSIGN(FrameTreeBrowserTest); | 27 DISALLOW_COPY_AND_ASSIGN(FrameTreeBrowserTest); |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 // wait for the previous navigation to stop. | 149 // wait for the previous navigation to stop. |
| 150 TestNavigationObserver tab_observer(wc, 1); | 150 TestNavigationObserver tab_observer(wc, 1); |
| 151 shell()->LoadURL(base_url.Resolve("blank.html")); | 151 shell()->LoadURL(base_url.Resolve("blank.html")); |
| 152 tab_observer.Wait(); | 152 tab_observer.Wait(); |
| 153 | 153 |
| 154 // The frame tree should now be cleared. | 154 // The frame tree should now be cleared. |
| 155 EXPECT_EQ(0UL, root->child_count()); | 155 EXPECT_EQ(0UL, root->child_count()); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace content | 158 } // namespace content |
| OLD | NEW |