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

Side by Side Diff: content/test/test_render_view_host_factory.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | content/test/web_gesture_curve_mock.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_host_factory.h" 5 #include "content/test/test_render_view_host_factory.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "content/browser/renderer_host/render_widget_host_impl.h" 8 #include "content/browser/renderer_host/render_widget_host_impl.h"
8 #include "content/browser/site_instance_impl.h" 9 #include "content/browser/site_instance_impl.h"
9 #include "content/public/browser/render_process_host_factory.h" 10 #include "content/public/browser/render_process_host_factory.h"
10 #include "content/test/test_render_view_host.h" 11 #include "content/test/test_render_view_host.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 TestRenderViewHostFactory::TestRenderViewHostFactory( 15 TestRenderViewHostFactory::TestRenderViewHostFactory(
15 RenderProcessHostFactory* rph_factory) { 16 RenderProcessHostFactory* rph_factory) {
16 SiteInstanceImpl::set_render_process_host_factory(rph_factory); 17 SiteInstanceImpl::set_render_process_host_factory(rph_factory);
(...skipping 11 matching lines...) Expand all
28 } 29 }
29 30
30 RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost( 31 RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost(
31 SiteInstance* instance, 32 SiteInstance* instance,
32 RenderViewHostDelegate* delegate, 33 RenderViewHostDelegate* delegate,
33 RenderWidgetHostDelegate* widget_delegate, 34 RenderWidgetHostDelegate* widget_delegate,
34 int32_t routing_id, 35 int32_t routing_id,
35 int32_t main_frame_routing_id, 36 int32_t main_frame_routing_id,
36 bool swapped_out) { 37 bool swapped_out) {
37 return new TestRenderViewHost(instance, 38 return new TestRenderViewHost(instance,
38 make_scoped_ptr(new RenderWidgetHostImpl( 39 base::WrapUnique(new RenderWidgetHostImpl(
39 widget_delegate, instance->GetProcess(), 40 widget_delegate, instance->GetProcess(),
40 routing_id, false /* hidden */)), 41 routing_id, false /* hidden */)),
41 delegate, main_frame_routing_id, swapped_out); 42 delegate, main_frame_routing_id, swapped_out);
42 } 43 }
43 44
44 } // namespace content 45 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | content/test/web_gesture_curve_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698