summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 17:47:39 +0000
committerjianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 17:47:39 +0000
commit4f0872bb0ff3bfaca9f765c64a6d76598daf4ed4 (patch)
tree29386cbcc60fdd28ffb5c4b199f81c5d222773b5
parentd854331ece6f611ff8ce6863dca4ef7b736bedae (diff)
downloadchromium_src-4f0872bb0ff3bfaca9f765c64a6d76598daf4ed4.zip
chromium_src-4f0872bb0ff3bfaca9f765c64a6d76598daf4ed4.tar.gz
chromium_src-4f0872bb0ff3bfaca9f765c64a6d76598daf4ed4.tar.bz2
Fix a bug in DownloadFile::Rename where we need to seek to the end of the file.
BUG=none TEST=none Review URL: http://codereview.chromium.org/601018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38628 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/download_file.cc5
-rw-r--r--chrome/browser/download/download_uitest.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index b152d18..40aa900 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -128,6 +128,11 @@ bool DownloadFile::Rename(const FilePath& new_path) {
if (!Open())
return false;
+
+ // Move to the end of the new file.
+ if (file_stream_->Seek(net::FROM_END, 0) < 0)
+ return false;
+
return true;
}
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index 2bbea62..421ad68 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -183,7 +183,7 @@ class DownloadTest : public UITest {
// Download a file with non-viewable content, verify that the
// download tab opened and the file exists.
// FLAKYONWIN: see http://crbug.com/20809
-TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
+TEST_F(DownloadTest, FLAKYONWIN(DownloadMimeType)) {
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
EXPECT_EQ(1, GetTabCount());