| Index: components/favicon/core/favicon_service.h
|
| diff --git a/components/favicon/core/favicon_service.h b/components/favicon/core/favicon_service.h
|
| index 2861fd9b7b8c716c5266cc83972246c72ae7e970..9585934169f21c7407aff49adb9fa1718a3a30af 100644
|
| --- a/components/favicon/core/favicon_service.h
|
| +++ b/components/favicon/core/favicon_service.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| @@ -35,7 +36,7 @@ class FaviconClient;
|
| class FaviconService : public KeyedService {
|
| public:
|
| // The FaviconClient must outlive the constructed FaviconService.
|
| - FaviconService(scoped_ptr<FaviconClient> favicon_client,
|
| + FaviconService(std::unique_ptr<FaviconClient> favicon_client,
|
| history::HistoryService* history_service);
|
|
|
| ~FaviconService() override;
|
| @@ -244,7 +245,7 @@ class FaviconService : public KeyedService {
|
| favicon_bitmap_results);
|
|
|
| base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
|
| - scoped_ptr<FaviconClient> favicon_client_;
|
| + std::unique_ptr<FaviconClient> favicon_client_;
|
| history::HistoryService* history_service_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FaviconService);
|
|
|