Fix and reenable AppendRelativePathTest which was broken on Windows....

base/file_path_unittest.cc

 // Copyright (c) 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 "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 467 matching lines @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath parent(cases[i].inputs[0]);
     FilePath child(cases[i].inputs[1]);
 
     EXPECT_EQ(parent.IsParent(child), cases[i].expected) <<
       "i: " << i << ", parent: " << parent.value() << ", child: " <<
       child.value();
   }
 }
 
-TEST_F(FilePathTest, DISABLED_AppendRelativePathTest) {
+TEST_F(FilePathTest, AppendRelativePathTest) {
   const struct BinaryTestData cases[] = {
+#if defined(FILE_PATH_USES_WIN_SEPARATORS)
+    { { FPL("/"),             FPL("/foo/bar/baz") },      FPL("foo\\bar\\baz")},
+#else  // FILE_PATH_USES_WIN_SEPARATORS
     { { FPL("/"),             FPL("/foo/bar/baz") },      FPL("foo/bar/baz")},
+#endif  // FILE_PATH_USES_WIN_SEPARATORS
     { { FPL("/foo/bar"),      FPL("/foo/bar/baz") },      FPL("baz")},
     { { FPL("/foo/bar/"),     FPL("/foo/bar/baz") },      FPL("baz")},
     { { FPL("//foo/bar/"),    FPL("//foo/bar/baz") },     FPL("baz")},
     { { FPL("/foo/bar"),      FPL("/foo2/bar/baz") },     FPL("")},
     { { FPL("/foo/bar.txt"),  FPL("/foo/bar/baz") },      FPL("")},
     { { FPL("/foo/bar"),      FPL("/foo/bar2/baz") },     FPL("")},
     { { FPL("/foo/bar"),      FPL("/foo/bar") },          FPL("")},
     { { FPL("/foo/bar/baz"),  FPL("/foo/bar") },          FPL("")},
     { { FPL("foo/bar"),       FPL("foo/bar/baz") },       FPL("baz")},
     { { FPL("foo/bar"),       FPL("foo2/bar/baz") },      FPL("")},
     { { FPL("foo/bar"),       FPL("foo/bar2/baz") },      FPL("")},
     { { FPL(""),              FPL("foo") },               FPL("")},
 #if defined(FILE_PATH_USES_DRIVE_LETTERS)
     { { FPL("c:/foo/bar"),    FPL("c:/foo/bar/baz") },    FPL("baz")},
     { { FPL("E:/foo/bar"),    FPL("e:/foo/bar/baz") },    FPL("baz")},
     { { FPL("f:/foo/bar"),    FPL("F:/foo/bar/baz") },    FPL("baz")},
     { { FPL("E:/Foo/bar"),    FPL("e:/foo/bar/baz") },    FPL("")},
     { { FPL("f:/foo/bar"),    FPL("F:/foo/Bar/baz") },    FPL("")},
-    { { FPL("c:/"),           FPL("c:/foo/bar/baz") },    FPL("foo/bar/baz")},
-    { { FPL("c:"),            FPL("c:/foo/bar/baz") },    FPL("foo/bar/baz")},
+#if defined(FILE_PATH_USES_WIN_SEPARATORS)
+    { { FPL("c:/"),           FPL("c:/foo/bar/baz") },    FPL("foo\\bar\\baz")},
+    // TODO(akalin): Figure out how to handle the corner case in the
+    // commented-out test case below.  Appending to an empty path gives
+    // /foo\bar\baz but appending to a nonempty path "blah" gives
+    // blah\foo\bar\baz.
+    // { { FPL("c:"),            FPL("c:/foo/bar/baz") }, FPL("foo\\bar\\baz")},
+#endif  // FILE_PATH_USES_WIN_SEPARATORS
     { { FPL("c:/foo/bar"),    FPL("d:/foo/bar/baz") },    FPL("")},
     { { FPL("c:/foo/bar"),    FPL("D:/foo/bar/baz") },    FPL("")},
     { { FPL("C:/foo/bar"),    FPL("d:/foo/bar/baz") },    FPL("")},
     { { FPL("c:/foo/bar"),    FPL("c:/foo2/bar/baz") },   FPL("")},
     { { FPL("e:/foo/bar"),    FPL("E:/foo2/bar/baz") },   FPL("")},
     { { FPL("F:/foo/bar"),    FPL("f:/foo2/bar/baz") },   FPL("")},
     { { FPL("c:/foo/bar"),    FPL("c:/foo/bar2/baz") },   FPL("")},
 #endif  // FILE_PATH_USES_DRIVE_LETTERS
 #if defined(FILE_PATH_USES_WIN_SEPARATORS)
     { { FPL("\\foo\\bar"),    FPL("\\foo\\bar\\baz") },   FPL("baz")},
@@ skipping 307 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath input(cases[i].input);
     bool observed = input.ReferencesParent();
     EXPECT_EQ(cases[i].expected, observed) <<
               "i: " << i << ", input: " << input.value();
   }
 }