| Index: chrome/browser/extensions/blacklist.h
|
| diff --git a/chrome/browser/extensions/blacklist.h b/chrome/browser/extensions/blacklist.h
|
| index 649052d0977e445e2dbaab7220dc8a98ba29db15..6c50f7b17949172a90d18c4b6f94e28b99ddf37a 100644
|
| --- a/chrome/browser/extensions/blacklist.h
|
| +++ b/chrome/browser/extensions/blacklist.h
|
| @@ -7,13 +7,13 @@
|
|
|
| #include <list>
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| @@ -146,7 +146,7 @@ class Blacklist : public KeyedService,
|
| // The cached BlacklistState's, received from BlacklistStateFetcher.
|
| BlacklistStateMap blacklist_state_cache_;
|
|
|
| - scoped_ptr<BlacklistStateFetcher> state_fetcher_;
|
| + std::unique_ptr<BlacklistStateFetcher> state_fetcher_;
|
|
|
| typedef std::list<std::pair<std::vector<std::string>,
|
| base::Callback<void()> > >
|
|
|