Remove file_util::kPathSeparator from posix.

webkit/tools/test_shell/test_shell_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <sys/stat.h>
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/basictypes.h"
@@ skipping 558 matching lines @@
     return;
   fwrite(data.c_str(), sizeof(std::string::value_type), data.size(), fp);
   fclose(fp);
 }
 
 void TestShell::DumpDocumentText()
 {
   std::wstring file_path;
   if (!PromptForSaveFile(L"Dump document text", &file_path))
     return;
-  
+
   WriteTextToFile(
       WideToUTF8(webkit_glue::DumpDocumentText(webView()->GetMainFrame())),
       WideToUTF8(file_path));
 }
 
 void TestShell::DumpRenderTree()
 {
   std::wstring file_path;
   if (!PromptForSaveFile(L"Dump render tree", &file_path))
     return;
-  
+
   WriteTextToFile(
       WideToUTF8(webkit_glue::DumpRenderer(webView()->GetMainFrame())),
       WideToUTF8(file_path));
 }
 
-/* static */
+// 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);
-    std::string replace_url8 = WideToUTF8(replace_url);
-    new_url = std::string("file:///") +
-        replace_url8.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() {
   // TODO(port): Show a modal dialog here with an attach to me message.
 }
 
 //-----------------------------------------------------------------------------
 
 namespace webkit_glue {
 
 std::wstring GetLocalizedString(int message_id) {
   NSString* idString = [NSString stringWithFormat:@"%d", message_id];
   NSString* localString = NSLocalizedString(idString, @"");
-  
+
   return UTF8ToWide([localString UTF8String]);
 }
 
 NSCursor* LoadCursor(int cursor_id) {
   // TODO(port): add some more options here
   return [NSCursor arrowCursor];
 }
 
 bool GetInspectorHTMLPath(std::string* path) {
   NSString* resource_path = [[NSBundle mainBundle] resourcePath];
@@ skipping 19 matching lines @@
   return false;
 }
 
 void DidLoadPlugin(const std::string& filename) {
 }
 
 void DidUnloadPlugin(const std::string& filename) {
 }
 
 }  // namespace webkit_glue