summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_manager_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/download/download_manager_unittest.cc')
-rw-r--r--chrome/browser/download/download_manager_unittest.cc112
1 files changed, 56 insertions, 56 deletions
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 51feb5b..3771030 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -17,12 +17,12 @@ class DownloadManagerTest : public testing::Test {
}
void GetGeneratedFilename(const std::string& content_disposition,
- const std::wstring& url,
+ const std::string& url,
const std::string& mime_type,
std::wstring* generated_name_string) {
DownloadCreateInfo info;
info.content_disposition = content_disposition;
- info.url = url;
+ info.url = GURL(url);
info.mime_type = mime_type;
FilePath generated_name;
download_manager_->GenerateFilename(&info, &generated_name);
@@ -40,277 +40,277 @@ namespace {
const struct {
const char* disposition;
- const wchar_t* url;
+ const char* url;
const char* mime_type;
const wchar_t* expected_name;
} kGeneratedFiles[] = {
// No 'filename' keyword in the disposition, use the URL
{"a_file_name.txt",
- L"http://www.evil.com/my_download.txt",
+ "http://www.evil.com/my_download.txt",
"text/plain",
L"my_download.txt"},
// Disposition has relative paths, remove them
{"filename=../../../../././../a_file_name.txt",
- L"http://www.evil.com/my_download.txt",
+ "http://www.evil.com/my_download.txt",
"text/plain",
L"a_file_name.txt"},
// Disposition has parent directories, remove them
{"filename=dir1/dir2/a_file_name.txt",
- L"http://www.evil.com/my_download.txt",
+ "http://www.evil.com/my_download.txt",
"text/plain",
L"a_file_name.txt"},
// No useful information in disposition or URL, use default
- {"", L"http://www.truncated.com/path/", "text/plain", L"download.txt"},
+ {"", "http://www.truncated.com/path/", "text/plain", L"download.txt"},
// A normal avi should get .avi and not .avi.avi
- {"", L"https://blah.google.com/misc/2.avi", "video/x-msvideo", L"2.avi"},
+ {"", "https://blah.google.com/misc/2.avi", "video/x-msvideo", L"2.avi"},
// Spaces in the disposition file name
{"filename=My Downloaded File.exe",
- L"http://www.frontpagehacker.com/a_download.exe",
+ "http://www.frontpagehacker.com/a_download.exe",
"application/octet-stream",
L"My Downloaded File.exe"},
{"filename=my-cat",
- L"http://www.example.com/my-cat",
+ "http://www.example.com/my-cat",
"image/jpeg",
L"my-cat.jpg"},
{"filename=my-cat",
- L"http://www.example.com/my-cat",
+ "http://www.example.com/my-cat",
"text/plain",
L"my-cat.txt"},
{"filename=my-cat",
- L"http://www.example.com/my-cat",
+ "http://www.example.com/my-cat",
"text/html",
L"my-cat.htm"},
{"filename=my-cat",
- L"http://www.example.com/my-cat",
+ "http://www.example.com/my-cat",
"dance/party",
L"my-cat"},
{"filename=my-cat.jpg",
- L"http://www.example.com/my-cat.jpg",
+ "http://www.example.com/my-cat.jpg",
"text/plain",
L"my-cat.jpg"},
{"filename=evil.exe",
- L"http://www.goodguy.com/evil.exe",
+ "http://www.goodguy.com/evil.exe",
"image/jpeg",
L"evil.jpg"},
{"filename=ok.exe",
- L"http://www.goodguy.com/ok.exe",
+ "http://www.goodguy.com/ok.exe",
"binary/octet-stream",
L"ok.exe"},
{"filename=evil.exe.exe",
- L"http://www.goodguy.com/evil.exe.exe",
+ "http://www.goodguy.com/evil.exe.exe",
"dance/party",
L"evil.exe.download"},
{"filename=evil.exe",
- L"http://www.goodguy.com/evil.exe",
+ "http://www.goodguy.com/evil.exe",
"application/xml",
L"evil.xml"},
{"filename=evil.exe",
- L"http://www.goodguy.com/evil.exe",
+ "http://www.goodguy.com/evil.exe",
"application/html+xml",
L"evil.download"},
{"filename=evil.exe",
- L"http://www.goodguy.com/evil.exe",
+ "http://www.goodguy.com/evil.exe",
"application/rss+xml",
L"evil.download"},
{"filename=utils.js",
- L"http://www.goodguy.com/utils.js",
+ "http://www.goodguy.com/utils.js",
"application/x-javascript",
L"utils.js"},
{"filename=contacts.js",
- L"http://www.goodguy.com/contacts.js",
+ "http://www.goodguy.com/contacts.js",
"application/json",
L"contacts.js"},
{"filename=utils.js",
- L"http://www.goodguy.com/utils.js",
+ "http://www.goodguy.com/utils.js",
"text/javascript",
L"utils.js"},
{"filename=utils.js",
- L"http://www.goodguy.com/utils.js",
+ "http://www.goodguy.com/utils.js",
"text/javascript;version=2",
L"utils.js"},
{"filename=utils.js",
- L"http://www.goodguy.com/utils.js",
+ "http://www.goodguy.com/utils.js",
"application/ecmascript",
L"utils.js"},
{"filename=utils.js",
- L"http://www.goodguy.com/utils.js",
+ "http://www.goodguy.com/utils.js",
"application/ecmascript;version=4",
L"utils.js"},
{"filename=program.exe",
- L"http://www.goodguy.com/program.exe",
+ "http://www.goodguy.com/program.exe",
"application/foo-bar",
L"program.exe"},
{"filename=../foo.txt",
- L"http://www.evil.com/../foo.txt",
+ "http://www.evil.com/../foo.txt",
"text/plain",
L"foo.txt"},
{"filename=..\\foo.txt",
- L"http://www.evil.com/..\\foo.txt",
+ "http://www.evil.com/..\\foo.txt",
"text/plain",
L"foo.txt"},
{"filename=.hidden",
- L"http://www.evil.com/.hidden",
+ "http://www.evil.com/.hidden",
"text/plain",
L"hidden.txt"},
{"filename=trailing.",
- L"http://www.evil.com/trailing.",
+ "http://www.evil.com/trailing.",
"dance/party",
L"trailing"},
{"filename=trailing.",
- L"http://www.evil.com/trailing.",
+ "http://www.evil.com/trailing.",
"text/plain",
L"trailing.txt"},
{"filename=.",
- L"http://www.evil.com/.",
+ "http://www.evil.com/.",
"dance/party",
L"download"},
{"filename=..",
- L"http://www.evil.com/..",
+ "http://www.evil.com/..",
"dance/party",
L"download"},
{"filename=...",
- L"http://www.evil.com/...",
+ "http://www.evil.com/...",
"dance/party",
L"download"},
{"a_file_name.txt",
- L"http://www.evil.com/",
+ "http://www.evil.com/",
"image/jpeg",
L"download.jpg"},
{"filename=",
- L"http://www.evil.com/",
+ "http://www.evil.com/",
"image/jpeg",
L"download.jpg"},
{"filename=simple",
- L"http://www.example.com/simple",
+ "http://www.example.com/simple",
"application/octet-stream",
L"simple"},
{"filename=COM1",
- L"http://www.goodguy.com/COM1",
+ "http://www.goodguy.com/COM1",
"application/foo-bar",
L"_COM1"},
{"filename=COM4.txt",
- L"http://www.goodguy.com/COM4.txt",
+ "http://www.goodguy.com/COM4.txt",
"text/plain",
L"_COM4.txt"},
{"filename=lpt1.TXT",
- L"http://www.goodguy.com/lpt1.TXT",
+ "http://www.goodguy.com/lpt1.TXT",
"text/plain",
L"_lpt1.TXT"},
{"filename=clock$.txt",
- L"http://www.goodguy.com/clock$.txt",
+ "http://www.goodguy.com/clock$.txt",
"text/plain",
L"_clock$.txt"},
{"filename=mycom1.foo",
- L"http://www.goodguy.com/mycom1.foo",
+ "http://www.goodguy.com/mycom1.foo",
"text/plain",
L"mycom1.foo"},
{"filename=Setup.exe.local",
- L"http://www.badguy.com/Setup.exe.local",
+ "http://www.badguy.com/Setup.exe.local",
"application/foo-bar",
L"Setup.exe.download"},
{"filename=Setup.exe.local.local",
- L"http://www.badguy.com/Setup.exe.local",
+ "http://www.badguy.com/Setup.exe.local",
"application/foo-bar",
L"Setup.exe.local.download"},
{"filename=Setup.exe.lnk",
- L"http://www.badguy.com/Setup.exe.lnk",
+ "http://www.badguy.com/Setup.exe.lnk",
"application/foo-bar",
L"Setup.exe.download"},
{"filename=Desktop.ini",
- L"http://www.badguy.com/Desktop.ini",
+ "http://www.badguy.com/Desktop.ini",
"application/foo-bar",
L"_Desktop.ini"},
{"filename=Thumbs.db",
- L"http://www.badguy.com/Thumbs.db",
+ "http://www.badguy.com/Thumbs.db",
"application/foo-bar",
L"_Thumbs.db"},
{"filename=source.srf",
- L"http://www.hotmail.com",
+ "http://www.hotmail.com",
"image/jpeg",
L"source.srf.jpg"},
{"filename=source.jpg",
- L"http://www.hotmail.com",
+ "http://www.hotmail.com",
"application/x-javascript",
L"source.jpg"},
// NetUtilTest.{GetSuggestedFilename, GetFileNameFromCD} test these
// more thoroughly. Tested below are a small set of samples.
{"attachment; filename=\"%EC%98%88%EC%88%A0%20%EC%98%88%EC%88%A0.jpg\"",
- L"http://www.examples.com/",
+ "http://www.examples.com/",
"image/jpeg",
L"\uc608\uc220 \uc608\uc220.jpg"},
{"attachment; name=abc de.pdf",
- L"http://www.examples.com/q.cgi?id=abc",
+ "http://www.examples.com/q.cgi?id=abc",
"application/octet-stream",
L"abc de.pdf"},
{"filename=\"=?EUC-JP?Q?=B7=DD=BD=D13=2Epng?=\"",
- L"http://www.example.com/path",
+ "http://www.example.com/path",
"image/png",
L"\x82b8\x8853" L"3.png"},
// The following two have invalid CD headers and filenames come
// from the URL.
{"attachment; filename==?iiso88591?Q?caf=EG?=",
- L"http://www.example.com/test%20123",
+ "http://www.example.com/test%20123",
"image/jpeg",
L"test 123.jpg"},
{"malformed_disposition",
- L"http://www.google.com/%EC%98%88%EC%88%A0%20%EC%98%88%EC%88%A0.jpg",
+ "http://www.google.com/%EC%98%88%EC%88%A0%20%EC%98%88%EC%88%A0.jpg",
"image/jpeg",
L"\uc608\uc220 \uc608\uc220.jpg"},
// Invalid C-D. No filename from URL. Falls back to 'download'.
{"attachment; filename==?iso88591?Q?caf=E3?",
- L"http://www.google.com/path1/path2/",
+ "http://www.google.com/path1/path2/",
"image/jpeg",
L"download.jpg"},
generated by cgit v1.1 at 2025-02-01 11:08:39 +0000