summaryrefslogtreecommitdiffstats
path: root/content/browser/indexed_db/leveldb/leveldb_database.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-25 22:16:36 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-26 06:17:30 +0000
commit36b6aec9a5f4953e2177146503096ca7de00cc36 (patch)
treea1d68bc1fab0b8127d7f47d3f9b3550eada5ac15 /content/browser/indexed_db/leveldb/leveldb_database.cc
parent2729e442b1172c5094503a03fe356c8580bb919d (diff)
downloadchromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.zip
chromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.tar.gz
chromium_src-36b6aec9a5f4953e2177146503096ca7de00cc36.tar.bz2
Convert Pass()→std::move() in //content/browser
BUG=557422 Review URL: https://codereview.chromium.org/1545243002 Cr-Commit-Position: refs/heads/master@{#366894}
Diffstat (limited to 'content/browser/indexed_db/leveldb/leveldb_database.cc')
-rw-r--r--content/browser/indexed_db/leveldb/leveldb_database.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/indexed_db/leveldb/leveldb_database.cc b/content/browser/indexed_db/leveldb/leveldb_database.cc
index 3bce96c..8bd919e 100644
--- a/content/browser/indexed_db/leveldb/leveldb_database.cc
+++ b/content/browser/indexed_db/leveldb/leveldb_database.cc
@@ -5,8 +5,8 @@
#include "content/browser/indexed_db/leveldb/leveldb_database.h"
#include <stdint.h>
-
#include <cerrno>
+#include <utility>
#include "base/files/file.h"
#include "base/logging.h"
@@ -308,9 +308,9 @@ leveldb::Status LevelDBDatabase::Open(const base::FilePath& file_name,
(*result).reset(new LevelDBDatabase);
(*result)->db_ = make_scoped_ptr(db);
- (*result)->comparator_adapter_ = comparator_adapter.Pass();
+ (*result)->comparator_adapter_ = std::move(comparator_adapter);
(*result)->comparator_ = comparator;
- (*result)->filter_policy_ = filter_policy.Pass();
+ (*result)->filter_policy_ = std::move(filter_policy);
return s;
}
@@ -335,13 +335,13 @@ scoped_ptr<LevelDBDatabase> LevelDBDatabase::OpenInMemory(
}
scoped_ptr<LevelDBDatabase> result(new LevelDBDatabase);
- result->env_ = in_memory_env.Pass();
+ result->env_ = std::move(in_memory_env);
result->db_ = make_scoped_ptr(db);
- result->comparator_adapter_ = comparator_adapter.Pass();
+ result->comparator_adapter_ = std::move(comparator_adapter);
result->comparator_ = comparator;
- result->filter_policy_ = filter_policy.Pass();
+ result->filter_policy_ = std::move(filter_policy);
- return result.Pass();
+ return result;
}
leveldb::Status LevelDBDatabase::Put(const StringPiece& key,
@@ -419,7 +419,7 @@ scoped_ptr<LevelDBIterator> LevelDBDatabase::CreateIterator(
scoped_ptr<leveldb::Iterator> i(db_->NewIterator(read_options));
return scoped_ptr<LevelDBIterator>(
- IndexedDBClassFactory::Get()->CreateIteratorImpl(i.Pass()));
+ IndexedDBClassFactory::Get()->CreateIteratorImpl(std::move(i)));
}
const LevelDBComparator* LevelDBDatabase::Comparator() const {