chromium/src
0
Fork 0
Code Activity

Upgrade apps from deprecated Value-conversion API

Browse Source 
Bug: 1086733
Change-Id: I9ecb65664757bb34df242ec9a6c08457fef225d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2235136
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776461}
This commit is contained in:
Nigel Tao
2020-06-09 10:33:37 +00:00
committed by Commit Bot
parent 6057541d74
commit abfa80ecd9
2 changed files with 8 additions and 5 deletions

1
apps/BUILD.gn

@ -37,6 +37,7 @@ static_library("apps") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
deps = [
"//base/util/values:values_util",
"//components/keyed_service/content",
"//content/public/browser",
"//content/public/common",

12
apps/saved_files_service.cc

@ -13,7 +13,7 @@
#include <utility>
#include "apps/saved_files_service_factory.h"
#include "base/value_conversions.h"
#include "base/util/values/values_util.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/notification_service.h"
#include "extensions/browser/api/file_system/saved_file_entry.h"
@ -67,7 +67,8 @@ void AddSavedFileEntry(ExtensionPrefs* prefs,
std::unique_ptr<base::DictionaryValue> file_entry_dict =
std::make_unique<base::DictionaryValue>();
file_entry_dict->SetKey(kFileEntryPath, CreateFilePathValue(file_entry.path));
file_entry_dict->SetKey(kFileEntryPath,
util::FilePathToValue(file_entry.path));
file_entry_dict->SetBoolean(kFileEntryIsDirectory, file_entry.is_directory);
file_entry_dict->SetInteger(kFileEntrySequenceNumber,
file_entry.sequence_number);
@ -124,8 +125,9 @@ std::vector<SavedFileEntry> GetSavedFileEntries(
const base::Value* path_value;
if (!file_entry->Get(kFileEntryPath, &path_value))
continue;
base::FilePath file_path;
if (!GetValueAsFilePath(*path_value, &file_path))
base::Optional<base::FilePath> file_path =
util::ValueToFilePath(*path_value);
if (!file_path)
continue;
bool is_directory = false;
file_entry->GetBoolean(kFileEntryIsDirectory, &is_directory);
@ -135,7 +137,7 @@ std::vector<SavedFileEntry> GetSavedFileEntries(
if (!sequence_number)
continue;
result.push_back(
SavedFileEntry(it.key(), file_path, is_directory, sequence_number));
SavedFileEntry(it.key(), *file_path, is_directory, sequence_number));
}
return result;
}