c686e8f4fd
Automated patch, intended to be effectively a no-op. Context: https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer As of https://crrev.com/1204351, absl::optional is now a type alias for std::optional. We should migrate toward it. Script: ``` function replace { echo "Replacing $1 by $2" git grep -l "$1" \ | cut -f1 -d: \ | grep \ -e "^content" \ | sort \ | uniq \ | grep \ -e "\.h" \ -e "\.cc" \ -e "\.mm" \ -e "\.py" \ | xargs sed -i "s/$1/$2/g" } replace "absl::make_optional" "std::make_optional" replace "absl::optional" "std::optional" replace "absl::nullopt" "std::nullopt" replace "absl::in_place" "std::in_place" replace "absl::in_place_t" "std::in_place_t" replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>" git cl format ``` # Skipping unrelated "check_network_annotation" errors. NOTRY=True Bug: chromium:1500249 Change-Id: Icfd31a71d8faf63a2e8d5401127e7ee74cc1c413 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5185537 Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org> Owners-Override: Avi Drissman <avi@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/main@{#1245739}
118 lines
3.8 KiB
C++
118 lines
3.8 KiB
C++
// Copyright 2017 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "content/public/common/drop_data.h"
|
|
|
|
#include <optional>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "build/build_config.h"
|
|
#include "net/base/mime_util.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
|
|
#if BUILDFLAG(IS_WIN)
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#define CONVERT_IF_NEEDED(x) base::UTF8ToWide((x))
|
|
#else
|
|
#define CONVERT_IF_NEEDED(x) x
|
|
#endif
|
|
|
|
namespace content {
|
|
|
|
using FileSystemFileInfo = DropData::FileSystemFileInfo;
|
|
|
|
TEST(DropDataTest, GetSafeFilenameForImageFileContents) {
|
|
static constexpr struct {
|
|
const char* const extension;
|
|
const bool is_well_known;
|
|
const bool should_generate_filename;
|
|
} kTestCases[] = {
|
|
// Extensions with a well-known but non-image MIME type should not result
|
|
// in the generation of a filename.
|
|
{"exe", true, false},
|
|
{"html", true, false},
|
|
{"js", true, false},
|
|
// Extensions that do not have a well-known MIME type should not result in
|
|
// the generation of a filename.
|
|
{"should-not-be-known-extension", false, false},
|
|
// Extensions with a well-known MIME type should result in the generation
|
|
// of a filename.
|
|
{"bmp", true, true},
|
|
{"gif", true, true},
|
|
{"ico", true, true},
|
|
{"jpg", true, true},
|
|
{"png", true, true},
|
|
{"svg", true, true},
|
|
{"tif", true, true},
|
|
{"xbm", true, true},
|
|
{"webp", true, true},
|
|
};
|
|
|
|
for (const auto& test_case : kTestCases) {
|
|
SCOPED_TRACE(test_case.extension);
|
|
std::string ignored;
|
|
ASSERT_EQ(test_case.is_well_known,
|
|
net::GetWellKnownMimeTypeFromExtension(
|
|
CONVERT_IF_NEEDED(test_case.extension), &ignored));
|
|
|
|
DropData drop_data;
|
|
drop_data.file_contents_source_url =
|
|
GURL(base::StringPrintf("https://example.com/testresource"));
|
|
drop_data.file_contents_filename_extension =
|
|
CONVERT_IF_NEEDED(test_case.extension);
|
|
std::optional<base::FilePath> generated_name =
|
|
drop_data.GetSafeFilenameForImageFileContents();
|
|
ASSERT_EQ(test_case.should_generate_filename, generated_name.has_value());
|
|
|
|
if (test_case.should_generate_filename) {
|
|
// base::FilePath::Extension() returns the preceeding dot, so drop it
|
|
// before doing the comparison.
|
|
EXPECT_EQ(CONVERT_IF_NEEDED(test_case.extension),
|
|
generated_name->Extension().substr(1));
|
|
}
|
|
}
|
|
}
|
|
|
|
TEST(DropDataTest, ReadFileSystemFilesFromPickle) {
|
|
{
|
|
std::vector<FileSystemFileInfo> in_files = {
|
|
{GURL("filesystem:http://www.example.com/path1"), 1000, "filesystem1"},
|
|
{GURL("filesystem:http://www.example.com/path2"), 2000, "filesystem2"},
|
|
{GURL("filesystem:http://www.example.com/path3"), 3000, "filesystem3"},
|
|
};
|
|
std::vector<FileSystemFileInfo> out_files;
|
|
base::Pickle pickle;
|
|
|
|
FileSystemFileInfo::WriteFileSystemFilesToPickle(in_files, &pickle);
|
|
|
|
EXPECT_TRUE(
|
|
FileSystemFileInfo::ReadFileSystemFilesFromPickle(pickle, &out_files));
|
|
|
|
ASSERT_EQ(in_files.size(), out_files.size());
|
|
for (size_t i = 0; i < in_files.size(); i++) {
|
|
EXPECT_EQ(in_files[i].url, out_files[i].url);
|
|
EXPECT_EQ(in_files[i].size, out_files[i].size);
|
|
EXPECT_EQ(in_files[i].filesystem_id, out_files[i].filesystem_id);
|
|
}
|
|
}
|
|
|
|
{
|
|
std::vector<FileSystemFileInfo> in_files = {
|
|
{GURL("invalid-url"), 1000, "filesystem1"},
|
|
};
|
|
std::vector<FileSystemFileInfo> out_files;
|
|
base::Pickle pickle;
|
|
|
|
FileSystemFileInfo::WriteFileSystemFilesToPickle(in_files, &pickle);
|
|
|
|
EXPECT_FALSE(
|
|
FileSystemFileInfo::ReadFileSystemFilesFromPickle(pickle, &out_files));
|
|
}
|
|
}
|
|
|
|
} // namespace content
|
|
|
|
#undef CONVERT_IF_NEEDED
|