| Index: content/renderer/renderer_main.cc
|
| diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
|
| index 661319b2f7ffebb4ff2b63bf138ea8015716d46b..e989b2722df81f3210589820680a54c6c058282c 100644
|
| --- a/content/renderer/renderer_main.cc
|
| +++ b/content/renderer/renderer_main.cc
|
| @@ -75,8 +75,8 @@ static void HandleRendererErrorTestParameters(
|
| }
|
|
|
| #if defined(USE_OZONE)
|
| -base::LazyInstance<scoped_ptr<ui::ClientNativePixmapFactory>> g_pixmap_factory =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| +base::LazyInstance<std::unique_ptr<ui::ClientNativePixmapFactory>>
|
| + g_pixmap_factory = LAZY_INSTANCE_INITIALIZER;
|
| #endif
|
|
|
| } // namespace
|
| @@ -135,12 +135,12 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| // As long as scrollbars on Mac are painted with Cocoa, the message pump
|
| // needs to be backed by a Foundation-level loop to process NSTimers. See
|
| // http://crbug.com/306348#c24 for details.
|
| - scoped_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
|
| - scoped_ptr<base::MessageLoop> main_message_loop(
|
| + std::unique_ptr<base::MessagePump> pump(new base::MessagePumpNSRunLoop());
|
| + std::unique_ptr<base::MessageLoop> main_message_loop(
|
| new base::MessageLoop(std::move(pump)));
|
| #else
|
| // The main message loop of the renderer services doesn't have IO or UI tasks.
|
| - scoped_ptr<base::MessageLoop> main_message_loop(new base::MessageLoop());
|
| + std::unique_ptr<base::MessageLoop> main_message_loop(new base::MessageLoop());
|
| #endif
|
|
|
| base::PlatformThread::SetName("CrRendererMain");
|
| @@ -167,13 +167,13 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| DCHECK(result);
|
| }
|
|
|
| - scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| + std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
| parsed_command_line.GetSwitchValueASCII(switches::kEnableFeatures),
|
| parsed_command_line.GetSwitchValueASCII(switches::kDisableFeatures));
|
| base::FeatureList::SetInstance(std::move(feature_list));
|
|
|
| - scoped_ptr<scheduler::RendererScheduler> renderer_scheduler(
|
| + std::unique_ptr<scheduler::RendererScheduler> renderer_scheduler(
|
| scheduler::RendererScheduler::Create());
|
|
|
| // PlatformInitialize uses FieldTrials, so this must happen later.
|
|
|