Move path functions from file_util to FilePath object.

chrome/browser/net/url_fixer_upper_unittest.cc

 // Copyright (c) 2011 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 <stdlib.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 450 matching lines @@
 
   EXPECT_TRUE(file_util::Delete(original, false));
 }
 
 TEST(URLFixerUpperTest, FixupRelativeFile) {
   base::FilePath full_path, dir;
   base::FilePath file_part(
       FILE_PATH_LITERAL("url_fixer_upper_existing_file.txt"));
   ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir));
   ASSERT_TRUE(MakeTempFile(dir, file_part, &full_path));
-  ASSERT_TRUE(file_util::AbsolutePath(&full_path));
+  full_path = base::MakeAbsoluteFilePath(full_path);
+  ASSERT_FALSE(full_path.empty());
 
   // make sure we pass through good URLs
   for (size_t i = 0; i < arraysize(fixup_cases); ++i) {
     fixup_case value = fixup_cases[i];
 #if defined(OS_WIN)
     base::FilePath input(UTF8ToWide(value.input));
 #elif defined(OS_POSIX)
     base::FilePath input(value.input);
 #endif
     EXPECT_EQ(value.output,
@@ skipping 17 matching lines @@
 
   // make a subdir to make sure relative paths with directories work, also
   // test spaces:
   // "app_dir\url fixer-upper dir\url fixer-upper existing file.txt"
   base::FilePath sub_dir(FILE_PATH_LITERAL("url fixer-upper dir"));
   base::FilePath sub_file(
       FILE_PATH_LITERAL("url fixer-upper existing file.txt"));
   base::FilePath new_dir = dir.Append(sub_dir);
   file_util::CreateDirectory(new_dir);
   ASSERT_TRUE(MakeTempFile(new_dir, sub_file, &full_path));
-  ASSERT_TRUE(file_util::AbsolutePath(&full_path));
+  full_path = base::MakeAbsoluteFilePath(full_path);
+  ASSERT_FALSE(full_path.empty());
 
   // test file in the subdir
   base::FilePath relative_file = sub_dir.Append(sub_file);
   EXPECT_TRUE(IsMatchingFileURL(URLFixerUpper::FixupRelativeFile(dir,
       relative_file).possibly_invalid_spec(), full_path));
 
   // test file in the subdir with different slashes and escaping.
   base::FilePath::StringType relative_file_str = sub_dir.value() +
       FILE_PATH_LITERAL("/") + sub_file.value();
   ReplaceSubstringsAfterOffset(&relative_file_str, 0,
@@ skipping 12 matching lines @@
   EXPECT_TRUE(file_util::Delete(full_path, false));
   EXPECT_TRUE(file_util::Delete(new_dir, true));
 
   // Test that an obvious HTTP URL isn't accidentally treated as an absolute
   // file path (on account of system-specific craziness).
   base::FilePath empty_path;
   base::FilePath http_url_path(FILE_PATH_LITERAL("http://../"));
   EXPECT_TRUE(URLFixerUpper::FixupRelativeFile(
       empty_path, http_url_path).SchemeIs("http"));
 }