Move path functions from file_util to FilePath object.

webkit/glue/dom_serializer_unittest.cc

 // Copyright (c) 2010 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/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/hash_tables.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 661 matching lines @@
 }
 
 // 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, SerializeHTMLDOMWithBaseTag) {
   // There are total 2 available base tags in this test file.
   const int kTotalBaseTagCountInTestFile = 2;
 
-  base::FilePath page_file_path = data_dir_.AppendASCII("dom_serializer");
-  file_util::EnsureEndsWithSeparator(&page_file_path);
+  base::FilePath page_file_path =
+      data_dir_.AppendASCII("dom_serializer").AsEndingWithSeparator();
 
   // Get page dir URL which is base URL of this file.
   GURL path_dir_url = net::FilePathToFileURL(page_file_path);
   // Get file path.
   page_file_path =
       page_file_path.AppendASCII("html_doc_has_base_tag.htm");
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
@@ skipping 170 matching lines @@
   ASSERT_TRUE(web_frame != NULL);
   WebDocument doc = web_frame->document();
   WebNode lastNodeInBody = doc.body().lastChild();
   ASSERT_EQ(WebNode::ElementNode, lastNodeInBody.nodeType());
   WebString uri = webkit_glue::GetSubResourceLinkFromElement(
       lastNodeInBody.to<WebElement>());
   EXPECT_TRUE(uri.isNull());
 }
 
 }  // namespace