diff --git a/apps/BUILD.gn b/apps/BUILD.gn
index bba3724ca1d0a..4b21b4afaed6f 100644
--- a/apps/BUILD.gn
+++ b/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",
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc
index 26bfb1ce43e4f..fbb91ea638df5 100644
--- a/apps/saved_files_service.cc
+++ b/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;
 }