Move path functions from file_util to FilePath object.

webkit/support/webkit_support.cc

 // Copyright (c) 2012 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/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 240 matching lines @@
     basePath = basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else if (file_util::PathExists(
           basePath.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
     basePath = basePath.Append(FILE_PATH_LITERAL("../.."));
   } else if (file_util::PathExists(
           basePath.Append(FILE_PATH_LITERAL("webkit/support")))) {
     // We're in a WebKit-only/xcodebuild checkout on Mac
     basePath = basePath.Append(FILE_PATH_LITERAL("../../.."));
   }
-  CHECK(file_util::AbsolutePath(&basePath));
+  basePath = base::MakeAbsoluteFilePath(basePath);
+  CHECK(!basePath.empty());
   // We're in a WebKit-only, make-build, so the DIR_SOURCE_ROOT is already the
   // WebKit root. That, or we have no idea where we are.
   return basePath;
 }
 
 class WebKitClientMessageLoopImpl
     : public WebDevToolsAgentClient::WebKitClientMessageLoop {
  public:
   WebKitClientMessageLoopImpl() : message_loop_(MessageLoop::current()) {}
   virtual ~WebKitClientMessageLoopImpl() {
@@ skipping 297 matching lines @@
       FROM_HERE,
       base::Bind(&TaskAdaptor::Run, base::Owned(task)),
       base::TimeDelta::FromMilliseconds(delay_ms));
 }
 
 // Wrappers for FilePath and file_util
 
 WebString GetAbsoluteWebStringFromUTF8Path(const std::string& utf8_path) {
 #if defined(OS_WIN)
   base::FilePath path(UTF8ToWide(utf8_path));
-  file_util::AbsolutePath(&path);
-  return WebString(path.value());
+  return WebString(base::MakeAbsoluteFilePath(path).value());
 #else
   base::FilePath path(base::SysWideToNativeMB(base::SysUTF8ToWide(utf8_path)));
 #if defined(OS_ANDROID)
   if (WebKit::layoutTestMode()) {
     // See comment of TestEnvironment::set_mock_current_directory().
     if (!path.IsAbsolute()) {
       // Not using FilePath::Append() because it can't handle '..' in path.
       DCHECK(test_environment);
       GURL base_url = net::FilePathToFileURL(
           test_environment->mock_current_directory()
               .Append(FILE_PATH_LITERAL("foo")));
       net::FileURLToFilePath(base_url.Resolve(path.value()), &path);
     }
   } else {
-    file_util::AbsolutePath(&path);
+    path = base::MakeAbsoluteFilePath(path);
   }
 #else
-  file_util::AbsolutePath(&path);
+  path = base::MakeAbsoluteFilePath(path);
 #endif  // else defined(OS_ANDROID)
   return WideToUTF16(base::SysNativeMBToWide(path.value()));
 #endif  // else defined(OS_WIN)
 }
 
 WebURL CreateURLForPathOrURL(const std::string& path_or_url_in_nativemb) {
   // NativeMB to UTF-8
   std::wstring wide_path_or_url
       = base::SysNativeMBToWide(path_or_url_in_nativemb);
   std::string path_or_url_in_utf8 = WideToUTF8(wide_path_or_url);
 
   GURL url(path_or_url_in_utf8);
   if (url.is_valid() && url.has_scheme())
     return WebURL(url);
 #if defined(OS_WIN)
   base::FilePath path(wide_path_or_url);
 #else
   base::FilePath path(path_or_url_in_nativemb);
 #endif
-  file_util::AbsolutePath(&path);
-  return net::FilePathToFileURL(path);
+  return net::FilePathToFileURL(base::MakeAbsoluteFilePath(path));
 }
 
 WebURL RewriteLayoutTestsURL(const std::string& utf8_url) {
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen))
     return WebURL(GURL(utf8_url));
 
   base::FilePath replacePath =
@@ skipping 219 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support