| Index: components/leveldb_proto/leveldb_database.h
|
| diff --git a/components/leveldb_proto/leveldb_database.h b/components/leveldb_proto/leveldb_database.h
|
| index 463809d440ff94faed8e2173e8445db27c33b9a4..064c3eb1ce983e8e7d047f3a673872f2963fcd60 100644
|
| --- a/components/leveldb_proto/leveldb_database.h
|
| +++ b/components/leveldb_proto/leveldb_database.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef COMPONENTS_LEVELDB_PROTO_LEVELDB_DATABASE_H_
|
| #define COMPONENTS_LEVELDB_PROTO_LEVELDB_DATABASE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/threading/thread_collision_warner.h"
|
|
|
| @@ -52,8 +52,8 @@ class LevelDB {
|
|
|
| // The declaration order of these members matters: |db_| depends on |env_| and
|
| // therefore 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_;
|
| base::HistogramBase* open_histogram_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LevelDB);
|
|
|