| Index: chrome/browser/chromeos/extensions/media_player_api.h
|
| diff --git a/chrome/browser/chromeos/extensions/media_player_api.h b/chrome/browser/chromeos/extensions/media_player_api.h
|
| index 6c59cf9e1360f0f8379b5148159d1e88363d2e38..ce243b97d2842691952d9ba9861c79fd8d2f836b 100644
|
| --- a/chrome/browser/chromeos/extensions/media_player_api.h
|
| +++ b/chrome/browser/chromeos/extensions/media_player_api.h
|
| @@ -6,11 +6,11 @@
|
| #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_MEDIA_PLAYER_API_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "extensions/browser/browser_context_keyed_api_factory.h"
|
| #include "extensions/browser/extension_function.h"
|
|
|
| @@ -46,7 +46,7 @@ class MediaPlayerAPI : public BrowserContextKeyedAPI {
|
| static const bool kServiceRedirectedInIncognito = true;
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|
| - scoped_ptr<MediaPlayerEventRouter> media_player_event_router_;
|
| + std::unique_ptr<MediaPlayerEventRouter> media_player_event_router_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MediaPlayerAPI);
|
| };
|
|
|