Index: components/leveldb_proto/proto_database.h |
diff --git a/components/leveldb_proto/proto_database.h b/components/leveldb_proto/proto_database.h |
index 1c0a063be6d887f04972b2a3e29d6ddfb954a6e0..30949bf3bdf3ddd25b4c74a5a311507dde2abcd4 100644 |
--- a/components/leveldb_proto/proto_database.h |
+++ b/components/leveldb_proto/proto_database.h |
@@ -5,12 +5,12 @@ |
#ifndef COMPONENTS_LEVELDB_PROTO_PROTO_DATABASE_H_ |
#define COMPONENTS_LEVELDB_PROTO_PROTO_DATABASE_H_ |
+#include <memory> |
#include <string> |
#include <utility> |
#include <vector> |
#include "base/callback_forward.h" |
-#include "base/memory/scoped_ptr.h" |
namespace base { |
class FilePath; |
@@ -26,7 +26,7 @@ class ProtoDatabase { |
using InitCallback = base::Callback<void(bool success)>; |
using UpdateCallback = base::Callback<void(bool success)>; |
using LoadCallback = |
- base::Callback<void(bool success, scoped_ptr<std::vector<T>>)>; |
+ base::Callback<void(bool success, std::unique_ptr<std::vector<T>>)>; |
using DestroyCallback = base::Callback<void(bool success)>; |
// A list of key-value (string, T) tuples. |
@@ -44,8 +44,8 @@ class ProtoDatabase { |
// |keys_to_remove| from the database. |callback| will be invoked on the |
// calling thread when complete. |
virtual void UpdateEntries( |
- scoped_ptr<KeyEntryVector> entries_to_save, |
- scoped_ptr<std::vector<std::string>> keys_to_remove, |
+ std::unique_ptr<KeyEntryVector> entries_to_save, |
+ std::unique_ptr<std::vector<std::string>> keys_to_remove, |
const UpdateCallback& callback) = 0; |
// Asynchronously loads all entries from the database and invokes |callback| |