| Index: content/browser/notifications/notification_database.h
|
| diff --git a/content/browser/notifications/notification_database.h b/content/browser/notifications/notification_database.h
|
| index e5914e1abf1a7bc80517cda3e914a36f1cd6f23f..00fae877dae125856affdd46707b08559227d108 100644
|
| --- a/content/browser/notifications/notification_database.h
|
| +++ b/content/browser/notifications/notification_database.h
|
| @@ -7,12 +7,12 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <vector>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/sequence_checker.h"
|
| #include "content/common/content_export.h"
|
|
|
| @@ -185,12 +185,12 @@ class CONTENT_EXPORT NotificationDatabase {
|
|
|
| int64_t next_notification_id_ = 0;
|
|
|
| - scoped_ptr<const leveldb::FilterPolicy> filter_policy_;
|
| + std::unique_ptr<const leveldb::FilterPolicy> filter_policy_;
|
|
|
| // The declaration order for these members matters, as |db_| depends on |env_|
|
| // and thus has to be destructed first.
|
| - scoped_ptr<leveldb::Env> env_;
|
| - scoped_ptr<leveldb::DB> db_;
|
| + std::unique_ptr<leveldb::Env> env_;
|
| + std::unique_ptr<leveldb::DB> db_;
|
|
|
| State state_ = STATE_UNINITIALIZED;
|
|
|
|
|