summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download/download_manager_unittest.cc
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:49:58 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:49:58 +0000
commit6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1 (patch)
tree8e833c393312e866250077c15bc1d90464fe99d7 /chrome/browser/download/download_manager_unittest.cc
parent963dfb5a05c5b0e3fa8ed74d803f01cb10fd455e (diff)
downloadchromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.zip
chromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.tar.gz
chromium_src-6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1.tar.bz2
Support dragging a virtual file out of the browser.
BUG=none TEST=none Review URL: http://codereview.chromium.org/351029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_manager_unittest.cc')
-rw-r--r--chrome/browser/download/download_manager_unittest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc
index 7a4a9bd..7c839f4 100644
--- a/chrome/browser/download/download_manager_unittest.cc
+++ b/chrome/browser/download/download_manager_unittest.cc
@@ -7,7 +7,6 @@
#include "base/string_util.h"
#include "build/build_config.h"
#include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/download/download_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_LINUX)
@@ -35,7 +34,6 @@ class DownloadManagerTest : public testing::Test {
public:
DownloadManagerTest() {
download_manager_ = new DownloadManager();
- download_util::InitializeExeTypes(&download_manager_->exe_types_);
}
void GetGeneratedFilename(const std::string& content_disposition,
@@ -49,7 +47,7 @@ class DownloadManagerTest : public testing::Test {
info.mime_type = mime_type;
info.referrer_charset = referrer_charset;
FilePath generated_name;
- download_manager_->GenerateFilename(&info, &generated_name);
+ DownloadManager::GenerateFileNameFromInfo(&info, &generated_name);
*generated_name_string = generated_name.ToWStringHack();
}
@@ -579,7 +577,7 @@ const struct {
TEST_F(DownloadManagerTest, GetSafeFilename) {
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kSafeFilenameCases); ++i) {
FilePath path(kSafeFilenameCases[i].path);
- download_manager_->GenerateSafeFilename(kSafeFilenameCases[i].mime_type,
+ download_manager_->GenerateSafeFileName(kSafeFilenameCases[i].mime_type,
&path);
EXPECT_EQ(kSafeFilenameCases[i].expected_path, path.value());
}