Remove file_util::kPathSeparator from posix.

webkit/glue/dom_serializer_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 "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
 #include "DocumentType.h"
 #include "Element.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
 #include "HTMLHeadElement.h"
 #include "HTMLMetaElement.h"
 #include "HTMLNames.h"
 #include "KURL.h"
 #include "markup.h"
 #include "SharedBuffer.h"
 #include "SubstituteData.h"
 MSVC_POP_WARNING();
 #undef LOG
 
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
 #include "webkit/glue/dom_serializer_delegate.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webframe_impl.h"
@@ skipping 530 matching lines @@
   ASSERT_EQ(serialized_contents, orginal_contents);
 }
 
 // Test situation of BASE tag in original document when serializing HTML DOM.
 // When serializing, we should comment the BASE tag, append a new BASE tag.
 // rewrite all the savable URLs to relative local path, and change other URLs
 // to absolute URLs.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
   // There are total 2 available base tags in this test file.
   const int kTotalBaseTagCountInTestFile = 2;
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer");
-  page_file_path.append(1, file_util::kPathSeparator);
+
+  FilePath page_file_path = FilePath::FromWStringHack(data_dir_).Append(
+      FILE_PATH_LITERAL("dom_serializer"));
+  file_util::EnsureEndsWithSeparator(&page_file_path);
+
   // Get page dir URL which is base URL of this file.
-  GURL path_dir_url = net::FilePathToFileURL(page_file_path);
+  GURL path_dir_url = net::FilePathToFileURL(page_file_path.ToWStringHack());
   // Get file path.
-  file_util::AppendToPath(&page_file_path, L"html_doc_has_base_tag.htm");
+  page_file_path =
+      page_file_path.Append(FILE_PATH_LITERAL("html_doc_has_base_tag.htm"));
   // Get file URL.
-  GURL file_url = net::FilePathToFileURL(page_file_path);
+  GURL file_url = net::FilePathToFileURL(page_file_path.ToWStringHack());
   ASSERT_TRUE(file_url.SchemeIsFile());
   std::wstring page_url = ASCIIToWide(file_url.spec());
   // Load the test file.
   LoadPageFromURL(page_url);
   // Since for this test, we assume there is no savable sub-resource links for
   // this test file, also all links are relative URLs in this test file, so we
   // need to check those relative URLs and make sure document has BASE tag.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
           test_shell_->webView(), file_url);
@@ skipping 77 matching lines @@
       }
     }
   }
   // We have one more added BASE tag which is generated by JavaScript.
   ASSERT_EQ(new_base_tag_count, original_base_tag_count + 1);
   // Make sure in new document, the base URL is equal with the |path_dir_url|.
   GURL new_base_url(
     WideToUTF8(webkit_glue::StringToStdWString(doc->baseURL())));
   ASSERT_EQ(new_base_url, path_dir_url);
 }