| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/test_render_frame_host_factory.h" | 5 #include "content/test/test_render_frame_host_factory.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/ptr_util.h" |
| 9 #include "content/test/test_render_frame_host.h" | 10 #include "content/test/test_render_frame_host.h" |
| 10 | 11 |
| 11 namespace content { | 12 namespace content { |
| 12 | 13 |
| 13 TestRenderFrameHostFactory::TestRenderFrameHostFactory() { | 14 TestRenderFrameHostFactory::TestRenderFrameHostFactory() { |
| 14 RenderFrameHostFactory::RegisterFactory(this); | 15 RenderFrameHostFactory::RegisterFactory(this); |
| 15 } | 16 } |
| 16 | 17 |
| 17 TestRenderFrameHostFactory::~TestRenderFrameHostFactory() { | 18 TestRenderFrameHostFactory::~TestRenderFrameHostFactory() { |
| 18 RenderFrameHostFactory::UnregisterFactory(); | 19 RenderFrameHostFactory::UnregisterFactory(); |
| 19 } | 20 } |
| 20 | 21 |
| 21 scoped_ptr<RenderFrameHostImpl> | 22 std::unique_ptr<RenderFrameHostImpl> |
| 22 TestRenderFrameHostFactory::CreateRenderFrameHost( | 23 TestRenderFrameHostFactory::CreateRenderFrameHost( |
| 23 SiteInstance* site_instance, | 24 SiteInstance* site_instance, |
| 24 RenderViewHostImpl* render_view_host, | 25 RenderViewHostImpl* render_view_host, |
| 25 RenderFrameHostDelegate* delegate, | 26 RenderFrameHostDelegate* delegate, |
| 26 RenderWidgetHostDelegate* rwh_delegate, | 27 RenderWidgetHostDelegate* rwh_delegate, |
| 27 FrameTree* frame_tree, | 28 FrameTree* frame_tree, |
| 28 FrameTreeNode* frame_tree_node, | 29 FrameTreeNode* frame_tree_node, |
| 29 int32_t routing_id, | 30 int32_t routing_id, |
| 30 int32_t widget_routing_id, | 31 int32_t widget_routing_id, |
| 31 bool hidden) { | 32 bool hidden) { |
| 32 return make_scoped_ptr(new TestRenderFrameHost( | 33 return base::WrapUnique(new TestRenderFrameHost( |
| 33 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, | 34 site_instance, render_view_host, delegate, rwh_delegate, frame_tree, |
| 34 frame_tree_node, routing_id, widget_routing_id, hidden)); | 35 frame_tree_node, routing_id, widget_routing_id, hidden)); |
| 35 } | 36 } |
| 36 | 37 |
| 37 } // namespace content | 38 } // namespace content |
| OLD | NEW |