| Index: chrome/browser/value_store/leveldb_value_store.cc
|
| diff --git a/chrome/browser/value_store/leveldb_value_store.cc b/chrome/browser/value_store/leveldb_value_store.cc
|
| index 47ad0c0b2723de9aa1f374374fadb5f46d91de11..bad05dd9eb11c268a9882724b85a99fef0132541 100644
|
| --- a/chrome/browser/value_store/leveldb_value_store.cc
|
| +++ b/chrome/browser/value_store/leveldb_value_store.cc
|
| @@ -334,7 +334,7 @@ std::string LeveldbValueStore::EnsureDbIsOpen() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
|
|
|
| if (db_.get())
|
| - return "";
|
| + return std::string();
|
|
|
| #if defined(OS_POSIX)
|
| std::string os_path(db_path_.value());
|
| @@ -356,7 +356,7 @@ std::string LeveldbValueStore::EnsureDbIsOpen() {
|
| }
|
|
|
| db_.reset(db);
|
| - return "";
|
| + return std::string();
|
| }
|
|
|
| std::string LeveldbValueStore::ReadFromDb(
|
| @@ -371,7 +371,7 @@ std::string LeveldbValueStore::ReadFromDb(
|
| if (s.IsNotFound()) {
|
| // Despite there being no value, it was still a success.
|
| // Check this first because ok() is false on IsNotFound.
|
| - return "";
|
| + return std::string();
|
| }
|
|
|
| if (!s.ok())
|
| @@ -384,7 +384,7 @@ std::string LeveldbValueStore::ReadFromDb(
|
| }
|
|
|
| setting->reset(value);
|
| - return "";
|
| + return std::string();
|
| }
|
|
|
| std::string LeveldbValueStore::AddToBatch(
|
| @@ -410,16 +410,16 @@ std::string LeveldbValueStore::AddToBatch(
|
| batch->Put(key, value_as_json);
|
| }
|
|
|
| - return "";
|
| + return std::string();
|
| }
|
|
|
| std::string LeveldbValueStore::WriteToDb(leveldb::WriteBatch* batch) {
|
| leveldb::Status status = db_->Write(leveldb::WriteOptions(), batch);
|
| if (status.IsNotFound()) {
|
| NOTREACHED() << "IsNotFound() but writing?!";
|
| - return "";
|
| + return std::string();
|
| }
|
| - return status.ok() ? "" : status.ToString();
|
| + return status.ok() ? std::string() : status.ToString();
|
| }
|
|
|
| bool LeveldbValueStore::IsEmpty() {
|
|
|