Fixes bug in file_util::ReplaceExtension that could chop off path...

base/file_util_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 801 matching lines @@
 };
 
 TEST_F(FileUtilTest, ReplaceExtensionTest) {
   for (unsigned int i = 0; i < arraysize(kReplaceExtension); ++i) {
     std::wstring file_name(kReplaceExtension[i].file_name);
     file_util::ReplaceExtension(&file_name, kReplaceExtension[i].extension);
     EXPECT_EQ(file_name, kReplaceExtension[i].result);
   }
 }
 
+// Make sure ReplaceExtension doesn't replace an extension that occurs as one of
+// the directory names of the path.
+TEST_F(FileUtilTest, ReplaceExtensionTestWithPathSeparators) {
+  std::wstring path;
+  file_util::AppendToPath(&path, L"foo.bar");
+  file_util::AppendToPath(&path, L"foo");
+  // '/foo.bar/foo' with extension '.baz'
+  std::wstring result_path = path;
+  file_util::ReplaceExtension(&result_path, L".baz");
+  EXPECT_EQ(path + L".baz", result_path);
+}
+
 TEST_F(FileUtilTest, FileEnumeratorTest) {
   // Test an empty directory.
   file_util::FileEnumerator f0(test_dir_, true,
       file_util::FileEnumerator::FILES_AND_DIRECTORIES);
   EXPECT_EQ(f0.Next(), L"");
   EXPECT_EQ(f0.Next(), L"");
 
   // create the directories
   std::wstring dir1 = test_dir_;
   file_util::AppendToPath(&dir1, L"dir1");
@@ skipping 77 matching lines @@
 
   // Make sure the destructor closes the find handle while in the middle of a
   // query to allow TearDown to delete the directory.
   file_util::FileEnumerator f6(test_dir_, true,
       file_util::FileEnumerator::FILES_AND_DIRECTORIES);
   EXPECT_FALSE(f6.Next().empty());  // Should have found something
                                     // (we don't care what).
 }
 
 }  // namespace