| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "content/browser/frame_host/frame_tree.h" | 6 #include "content/browser/frame_host/frame_tree.h" |
| 7 #include "content/browser/frame_host/frame_tree_node.h" | 7 #include "content/browser/frame_host/frame_tree_node.h" |
| 8 #include "content/browser/renderer_host/render_view_host_impl.h" | 8 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 EXPECT_TRUE( | 196 EXPECT_TRUE( |
| 197 root->current_frame_host()->render_view_host()->IsRenderViewLive()); | 197 root->current_frame_host()->render_view_host()->IsRenderViewLive()); |
| 198 EXPECT_TRUE(root->current_frame_host()->IsRenderFrameLive()); | 198 EXPECT_TRUE(root->current_frame_host()->IsRenderFrameLive()); |
| 199 EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsRenderFrameLive()); | 199 EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsRenderFrameLive()); |
| 200 } | 200 } |
| 201 | 201 |
| 202 class CrossProcessFrameTreeBrowserTest : public ContentBrowserTest { | 202 class CrossProcessFrameTreeBrowserTest : public ContentBrowserTest { |
| 203 public: | 203 public: |
| 204 CrossProcessFrameTreeBrowserTest() {} | 204 CrossProcessFrameTreeBrowserTest() {} |
| 205 | 205 |
| 206 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE { | 206 virtual void SetUpCommandLine(base::CommandLine* command_line) override { |
| 207 command_line->AppendSwitch(switches::kSitePerProcess); | 207 command_line->AppendSwitch(switches::kSitePerProcess); |
| 208 } | 208 } |
| 209 | 209 |
| 210 private: | 210 private: |
| 211 DISALLOW_COPY_AND_ASSIGN(CrossProcessFrameTreeBrowserTest); | 211 DISALLOW_COPY_AND_ASSIGN(CrossProcessFrameTreeBrowserTest); |
| 212 }; | 212 }; |
| 213 | 213 |
| 214 // Ensure that we can complete a cross-process subframe navigation. | 214 // Ensure that we can complete a cross-process subframe navigation. |
| 215 #if defined(OS_ANDROID) | 215 #if defined(OS_ANDROID) |
| 216 #define MAYBE_CreateCrossProcessSubframeProxies DISABLED_CreateCrossProcessSubfr
ameProxies | 216 #define MAYBE_CreateCrossProcessSubframeProxies DISABLED_CreateCrossProcessSubfr
ameProxies |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 // Ensure that the RenderViews and RenderFrames are all live. | 271 // Ensure that the RenderViews and RenderFrames are all live. |
| 272 EXPECT_TRUE( | 272 EXPECT_TRUE( |
| 273 root->current_frame_host()->render_view_host()->IsRenderViewLive()); | 273 root->current_frame_host()->render_view_host()->IsRenderViewLive()); |
| 274 EXPECT_TRUE( | 274 EXPECT_TRUE( |
| 275 child->current_frame_host()->render_view_host()->IsRenderViewLive()); | 275 child->current_frame_host()->render_view_host()->IsRenderViewLive()); |
| 276 EXPECT_TRUE(root->current_frame_host()->IsRenderFrameLive()); | 276 EXPECT_TRUE(root->current_frame_host()->IsRenderFrameLive()); |
| 277 EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsRenderFrameLive()); | 277 EXPECT_TRUE(root->child_at(0)->current_frame_host()->IsRenderFrameLive()); |
| 278 } | 278 } |
| 279 | 279 |
| 280 } // namespace content | 280 } // namespace content |
| OLD | NEW |