| Index: chromecast/app/cast_main_delegate.h
|
| diff --git a/chromecast/app/cast_main_delegate.h b/chromecast/app/cast_main_delegate.h
|
| index 1e7609feaa60997fcb9e943e37b225f904eed1e5..12f0eae567ced2227323decce87d2b8cb47320a1 100644
|
| --- a/chromecast/app/cast_main_delegate.h
|
| +++ b/chromecast/app/cast_main_delegate.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROMECAST_APP_CAST_MAIN_DELEGATE_H_
|
| #define CHROMECAST_APP_CAST_MAIN_DELEGATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "chromecast/common/cast_content_client.h"
|
| #include "content/public/app/content_main_delegate.h"
|
| @@ -46,14 +47,14 @@ class CastMainDelegate : public content::ContentMainDelegate {
|
| private:
|
| void InitializeResourceBundle();
|
|
|
| - scoped_ptr<CastContentBrowserClient> browser_client_;
|
| - scoped_ptr<CastContentRendererClient> renderer_client_;
|
| - scoped_ptr<CastContentUtilityClient> utility_client_;
|
| - scoped_ptr<CastResourceDelegate> resource_delegate_;
|
| + std::unique_ptr<CastContentBrowserClient> browser_client_;
|
| + std::unique_ptr<CastContentRendererClient> renderer_client_;
|
| + std::unique_ptr<CastContentUtilityClient> utility_client_;
|
| + std::unique_ptr<CastResourceDelegate> resource_delegate_;
|
| CastContentClient content_client_;
|
|
|
| #if defined(OS_ANDROID)
|
| - scoped_ptr<content::BrowserMainRunner> browser_runner_;
|
| + std::unique_ptr<content::BrowserMainRunner> browser_runner_;
|
| #endif // defined(OS_ANDROID)
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CastMainDelegate);
|
|
|