| Index: content/app/android/content_main.cc
|
| diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc
|
| index fa4c781b54294e5333c2e5168b10ad759815b476..5b51323bc88bc9e0125632ef553644b14d4b537f 100644
|
| --- a/content/app/android/content_main.cc
|
| +++ b/content/app/android/content_main.cc
|
| @@ -4,11 +4,12 @@
|
|
|
| #include "content/app/android/content_main.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/at_exit.h"
|
| #include "base/base_switches.h"
|
| #include "base/command_line.h"
|
| #include "base/lazy_instance.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "content/public/app/content_main.h"
|
| #include "content/public/app/content_main_delegate.h"
|
| @@ -21,10 +22,10 @@ using base::LazyInstance;
|
| namespace content {
|
|
|
| namespace {
|
| -LazyInstance<scoped_ptr<ContentMainRunner> > g_content_runner =
|
| +LazyInstance<std::unique_ptr<ContentMainRunner>> g_content_runner =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -LazyInstance<scoped_ptr<ContentMainDelegate> > g_content_main_delegate =
|
| +LazyInstance<std::unique_ptr<ContentMainDelegate>> g_content_main_delegate =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| } // namespace
|
|
|