| Index: content/renderer/renderer_main_platform_delegate_win.cc
|
| diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
|
| index 25381a5efaae4dc99c6dfb07f37a661260538a88..0277d3ed7b511afed23333b2dee97f396b339120 100644
|
| --- a/content/renderer/renderer_main_platform_delegate_win.cc
|
| +++ b/content/renderer/renderer_main_platform_delegate_win.cc
|
| @@ -6,9 +6,10 @@
|
|
|
| #include <dwrite.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "base/win/scoped_comptr.h"
|
| #include "base/win/win_util.h"
|
| @@ -65,7 +66,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
|
| // After TimeZone::createDefault is called once here, the timezone ID is
|
| // cached and there's no more need to access the registry. If the sandbox
|
| // is disabled, we don't have to make this dummy call.
|
| - scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| + std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
|
|
| if (use_direct_write) {
|
| InitializeDWriteFontProxy();
|
|
|