4 files changed, 12 insertions, 5 deletions
diff --git a/chrome/browser/download/download_exe.cc b/chrome/browser/download/download_exe.cc
index ce33781..e54b485 100644
--- a/chrome/browser/download/download_exe.cc
+++ b/chrome/browser/download/download_exe.cc
@@ -72,6 +72,8 @@ static const wchar_t* const g_executables[] = {
   L"fxp",
   L"hlp",
   L"hta",
+  L"htm",
+  L"html",
   L"inf",
   L"ins",
   L"isp",
@@ -115,6 +117,8 @@ static const wchar_t* const g_executables[] = {
   L"sct",
   L"shb",
   L"shs",
+  L"shtm",
+  L"shtml",
   L"url",
   L"vb",
   L"vbe",
@@ -127,7 +131,10 @@ static const wchar_t* const g_executables[] = {
   L"ws",
   L"wsc",
   L"wsf",
-  L"wsh"
+  L"wsh",
+  L"xht",
+  L"xhtm",
+  L"xhtml"
 };
 
 void InitializeExeTypes(std::set<std::wstring>* exe_extensions) {
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index c961841..92e826f 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -201,8 +201,8 @@ TEST_F(DownloadTest, NoDownload) {
 // download tab opened and the file exists as the filename specified in the
 // header.  This also ensures we properly handle empty file downloads.
 TEST_F(DownloadTest, ContentDisposition) {
-  wstring file = L"download-test3.html";
-  wstring download_file = L"download-test3-attachment.html";
+  wstring file = L"download-test3.gif";
+  wstring download_file = L"download-test3-attachment.gif";
   wstring expected_title = L"100% - " + download_file;
 
   EXPECT_EQ(1, GetTabCount());
diff --git a/chrome/test/data/download-test3.html b/chrome/test/data/download-test3.gif
index e69de29..e69de29 100644
--- a/chrome/test/data/download-test3.html
+++ b/chrome/test/data/download-test3.gif
diff --git a/chrome/test/data/download-test3.html.mock-http-headers b/chrome/test/data/download-test3.gif.mock-http-headers
index 3a2e781..efdb82d 100644
--- a/chrome/test/data/download-test3.html.mock-http-headers
+++ b/chrome/test/data/download-test3.gif.mock-http-headers
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
-Content-Type: text/html; charset=utf-8
-Content-Disposition: attachment; filename="download-test3-attachment.html"
+Content-Type: image/gif
+Content-Disposition: attachment; filename="download-test3-attachment.gif"
 Content-Length: 0
 Date: Mon, 13 Nov 2006 21:38:09 GMT
 Expires: Tue, 14 Nov 2006 19:23:58 GMT