| Index: content/browser/indexed_db/indexed_db_backing_store.h
|
| diff --git a/content/browser/indexed_db/indexed_db_backing_store.h b/content/browser/indexed_db/indexed_db_backing_store.h
|
| index c5a28e034f9d8490009131b955461f2cb159151b..8d1545720efa9c1217bc8e772d15abc65119111e 100644
|
| --- a/content/browser/indexed_db/indexed_db_backing_store.h
|
| +++ b/content/browser/indexed_db/indexed_db_backing_store.h
|
| @@ -18,7 +18,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/strings/string_piece.h"
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| @@ -111,14 +110,15 @@ class CONTENT_EXPORT IndexedDBBackingStore
|
| const std::vector<IndexedDBBlobInfo>& blob_info() const {
|
| return blob_info_;
|
| }
|
| - void SetHandles(ScopedVector<storage::BlobDataHandle>* handles);
|
| + void SetHandles(
|
| + std::vector<std::unique_ptr<storage::BlobDataHandle>>* handles);
|
| std::unique_ptr<BlobChangeRecord> Clone() const;
|
|
|
| private:
|
| std::string key_;
|
| int64_t object_store_id_;
|
| std::vector<IndexedDBBlobInfo> blob_info_;
|
| - ScopedVector<storage::BlobDataHandle> handles_;
|
| + std::vector<std::unique_ptr<storage::BlobDataHandle>> handles_;
|
| DISALLOW_COPY_AND_ASSIGN(BlobChangeRecord);
|
| };
|
|
|
| @@ -153,12 +153,13 @@ class CONTENT_EXPORT IndexedDBBackingStore
|
| int64_t object_store_id,
|
| const std::string& object_store_data_key,
|
| std::vector<IndexedDBBlobInfo>*,
|
| - ScopedVector<storage::BlobDataHandle>* handles);
|
| - void PutBlobInfo(int64_t database_id,
|
| - int64_t object_store_id,
|
| - const std::string& object_store_data_key,
|
| - std::vector<IndexedDBBlobInfo>*,
|
| - ScopedVector<storage::BlobDataHandle>* handles);
|
| + std::vector<std::unique_ptr<storage::BlobDataHandle>>* handles);
|
| + void PutBlobInfo(
|
| + int64_t database_id,
|
| + int64_t object_store_id,
|
| + const std::string& object_store_data_key,
|
| + std::vector<IndexedDBBlobInfo>*,
|
| + std::vector<std::unique_ptr<storage::BlobDataHandle>>* handles);
|
|
|
| LevelDBTransaction* transaction() { return transaction_.get(); }
|
|
|
| @@ -453,7 +454,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
|
| int64_t object_store_id,
|
| const IndexedDBKey& key,
|
| IndexedDBValue* value,
|
| - ScopedVector<storage::BlobDataHandle>* handles,
|
| + std::vector<std::unique_ptr<storage::BlobDataHandle>>* handles,
|
| RecordIdentifier* record) WARN_UNUSED_RESULT;
|
| virtual leveldb::Status ClearObjectStore(
|
| IndexedDBBackingStore::Transaction* transaction,
|
|
|