Remove file_util::kPathSeparator from posix.

webkit/tools/test_shell/test_shell_gtk.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 "webkit/tools/test_shell/test_shell.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
@@ skipping 514 matching lines @@
 void TestShell::DumpRenderTree()
 {
   FilePath file_path;
   if (!::PromptForSaveFile("Dump render tree", &file_path))
       return;
 
   WriteTextToFile(webkit_glue::DumpRenderer(webView()->GetMainFrame()),
                   file_path);
 }
 
+// static
 std::string TestShell::RewriteLocalUrl(const std::string& url) {
   // Convert file:///tmp/LayoutTests urls to the actual location on disk.
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   std::string new_url(url);
   if (url.compare(0, kPrefixLen, kPrefix, kPrefixLen) == 0) {
-      std::wstring replace_url;
-      PathService::Get(base::DIR_EXE, &replace_url);
-      file_util::UpOneDirectory(&replace_url);
-      file_util::UpOneDirectory(&replace_url);
-      file_util::AppendToPath(&replace_url, L"webkit");
-      file_util::AppendToPath(&replace_url, L"data");
-      file_util::AppendToPath(&replace_url, L"layout_tests");
-      file_util::AppendToPath(&replace_url, L"LayoutTests");
-      replace_url.push_back(file_util::kPathSeparator);
-      new_url = std::string("file:///") +
-                WideToUTF8(replace_url).append(url.substr(kPrefixLen));
+    FilePath replace_path;
+    PathService::Get(base::DIR_EXE, &replace_path);
+    replace_path = replace_path.DirName().DirName().Append(
+        "webkit/data/layout_tests/LayoutTests/");
+    new_url = std::string("file://") + replace_path.value() +
+        url.substr(kPrefixLen);
   }
+
   return new_url;
 }
 
 // static
 void TestShell::ShowStartupDebuggingDialog() {
   GtkWidget* dialog = gtk_message_dialog_new(
     NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "attach to me?");
   gtk_window_set_title(GTK_WINDOW(dialog), "test_shell");
   gtk_dialog_run(GTK_DIALOG(dialog));  // Runs a nested message loop.
   gtk_widget_destroy(dialog);
@@ skipping 143 matching lines @@
   // of NOTIMPLEMENTED into our layout test diffs.
   // NOTIMPLEMENTED();
   return false;
 }
 
 ScreenInfo GetScreenInfo(gfx::ViewHandle window) {
   return GetScreenInfoHelper(window);
 }
 
 }  // namespace webkit_glue