Make default extension for downloading html "html" rather than "htm" on non-w...

chrome/browser/download/save_package_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/download/save_package.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define FPL FILE_PATH_LITERAL
+#if defined(OS_WIN)
+#define HTML_EXTENSION ".htm"
+#else
+#define HTML_EXTENSION ".html"
+#endif
 
 namespace {
 
 // This constant copied from save_package.cc.
 #if defined(OS_WIN)
 const uint32 kMaxFilePathLength = MAX_PATH - 1;
 #elif defined(OS_POSIX)
 const uint32 kMaxFilePathLength = PATH_MAX - 1;
 #endif
 
@@ skipping 21 matching lines @@
 
 }  // namespace
 
 class SavePackageTest : public testing::Test {
  public:
   SavePackageTest() {
     FilePath test_dir;
     PathService::Get(base::DIR_TEMP, &test_dir);
 
     save_package_success_ = new SavePackage(
-        test_dir.AppendASCII("testfile.htm"),
+        test_dir.AppendASCII("testfile" HTML_EXTENSION),
         test_dir.AppendASCII("testfile_files"));
 
     // We need to construct a path that is *almost* kMaxFilePathLength long
     long_file_name.resize(kMaxFilePathLength + long_file_name.length());
     while (long_file_name.length() < kMaxFilePathLength)
       long_file_name += long_file_name;
     long_file_name.resize(kMaxFilePathLength - 9 - test_dir.value().length());
 
     save_package_fail_ = new SavePackage(
-        test_dir.AppendASCII(long_file_name + ".htm"),
+        test_dir.AppendASCII(long_file_name + HTML_EXTENSION),
         test_dir.AppendASCII(long_file_name + "_files"));
   }
 
   bool GetGeneratedFilename(bool need_success_generate_filename,
                             const std::string& disposition,
                             const std::string& url,
                             bool need_htm_ext,
                             FilePath::StringType* generated_name) {
     SavePackage* save_package;
     if (need_success_generate_filename)
@@ skipping 20 matching lines @@
 static const struct {
   const char* disposition;
   const char* url;
   const FilePath::CharType* expected_name;
   bool need_htm_ext;
 } kGeneratedFiles[] = {
   // We mainly focus on testing duplicated names here, since retrieving file
   // name from disposition and url has been tested in DownloadManagerTest.
 
   // No useful information in disposition or URL, use default.
-  {"1.html", "http://www.savepage.com/", FPL("saved_resource.htm"), true},
+  {"1.html", "http://www.savepage.com/", FPL("saved_resource") HTML_EXTENSION,
+   true},
 
   // No duplicate occurs.
   {"filename=1.css", "http://www.savepage.com", FPL("1.css"), false},
 
   // No duplicate occurs.
   {"filename=1.js", "http://www.savepage.com", FPL("1.js"), false},
 
   // Append numbers for duplicated names.
   {"filename=1.css", "http://www.savepage.com", FPL("1(1).css"), false},
 
@@ skipping 63 matching lines @@
 
 static const struct {
   const FilePath::CharType* page_title;
   const FilePath::CharType* expected_name;
 } kExtensionTestCases[] = {
   // Extension is preserved if it is already proper for HTML.
   {FPL("filename.html"), FPL("filename.html")},
   {FPL("filename.HTML"), FPL("filename.HTML")},
   {FPL("filename.htm"), FPL("filename.htm")},
   // ".htm" is added if the extension is improper for HTML.
-  {FPL("hello.world"), FPL("hello.world.htm")},
-  {FPL("hello.txt"), FPL("hello.txt.htm")},
-  {FPL("is.html.good"), FPL("is.html.good.htm")},
+  {FPL("hello.world"), FPL("hello.world") FPL(HTML_EXTENSION)},
+  {FPL("hello.txt"), FPL("hello.txt") FPL(HTML_EXTENSION)},
+  {FPL("is.html.good"), FPL("is.html.good") FPL(HTML_EXTENSION)},
   // ".htm" is added if the name doesn't have an extension.
-  {FPL("helloworld"), FPL("helloworld.htm")},
-  {FPL("helloworld."), FPL("helloworld..htm")},
+  {FPL("helloworld"), FPL("helloworld") FPL(HTML_EXTENSION)},
+  {FPL("helloworld."), FPL("helloworld.") FPL(HTML_EXTENSION)},
 };
 
 TEST_F(SavePackageTest, TestEnsureHtmlExtension) {
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kExtensionTestCases); ++i) {
     FilePath original = FilePath(kExtensionTestCases[i].page_title);
     FilePath expected = FilePath(kExtensionTestCases[i].expected_name);
     FilePath actual = EnsureHtmlExtension(original);
     EXPECT_EQ(expected.value(), actual.value()) << "Failed for page title: " <<
         kExtensionTestCases[i].page_title;
   }
 }