Index: content/browser/android/synchronous_compositor_base.cc |
diff --git a/content/browser/android/synchronous_compositor_base.cc b/content/browser/android/synchronous_compositor_base.cc |
index 0d085095b9144adff98acc8b756f87a513c81e7f..62a7a5601c3a47bda94d3af9b67189982808e040 100644 |
--- a/content/browser/android/synchronous_compositor_base.cc |
+++ b/content/browser/android/synchronous_compositor_base.cc |
@@ -5,6 +5,7 @@ |
#include "content/browser/android/synchronous_compositor_base.h" |
#include "base/command_line.h" |
+#include "base/memory/ptr_util.h" |
#include "base/supports_user_data.h" |
#include "content/browser/android/in_process/synchronous_compositor_factory_impl.h" |
#include "content/browser/android/in_process/synchronous_compositor_impl.h" |
@@ -55,7 +56,7 @@ void SynchronousCompositor::SetClientForWebContents( |
} |
// static |
-scoped_ptr<SynchronousCompositorBase> SynchronousCompositorBase::Create( |
+std::unique_ptr<SynchronousCompositorBase> SynchronousCompositorBase::Create( |
RenderWidgetHostViewAndroid* rwhva, |
WebContents* web_contents) { |
DCHECK(web_contents); |
@@ -70,11 +71,11 @@ scoped_ptr<SynchronousCompositorBase> SynchronousCompositorBase::Create( |
!command_line->HasSwitch(switches::kSyncInputForSyncCompositor); |
bool use_in_proc_software_draw = |
command_line->HasSwitch(switches::kSingleProcess); |
- return make_scoped_ptr(new SynchronousCompositorHost( |
+ return base::WrapUnique(new SynchronousCompositorHost( |
rwhva, web_contents_android->synchronous_compositor_client(), |
async_input, use_in_proc_software_draw)); |
} |
- return make_scoped_ptr(new SynchronousCompositorImpl( |
+ return base::WrapUnique(new SynchronousCompositorImpl( |
rwhva, web_contents_android->synchronous_compositor_client())); |
} |