| Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
|
| index 9925445a86ae790816a238e1ea3c6160776825c1..9c45ab5ff911bc3175421e6fc27ff7b8df7213f4 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc
|
| @@ -362,13 +362,12 @@ ParentIDAndTitle MetadataDatabaseIndexOnDisk::PickMultiBackingFilePath() const {
|
| return ParentIDAndTitle();
|
|
|
| size_t pos = value.find('\0'); // '\0' is a separator.
|
| - int64 parent_id;
|
| - if (pos == std::string::npos ||
|
| - !base::StringToInt64(value.substr(0, pos), &parent_id))
|
| + if (pos == std::string::npos)
|
| return ParentIDAndTitle();
|
|
|
| - // Successfully found an entry.
|
| - return ParentIDAndTitle(parent_id, value.substr(pos + 1));
|
| + int64 parent_id;
|
| + return base::StringToInt64(value.substr(0, pos), &parent_id) ?
|
| + ParentIDAndTitle(parent_id, value.substr(pos + 1)) : ParentIDAndTitle();
|
| }
|
|
|
| int64 MetadataDatabaseIndexOnDisk::PickDirtyTracker() const {
|
|
|