Move path functions from file_util to FilePath object.

content/browser/gpu/gpu_pixel_browsertest.cc

 // Copyright (c) 2013 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/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 36 matching lines @@
 const char kGeneratedDir[] = "generated-dir";
 // Command line flag for overriding the default location for reference images.
 const char kReferenceDir[] = "reference-dir";
 // Command line flag for Chromium build revision.
 const char kBuildRevision[] = "build-revision";
 
 // Reads and decodes a PNG image to a bitmap. Returns true on success. The PNG
 // should have been encoded using |gfx::PNGCodec::Encode|.
 bool ReadPNGFile(const base::FilePath& file_path, SkBitmap* bitmap) {
   DCHECK(bitmap);
-  base::FilePath abs_path(file_path);
-  if (!file_util::AbsolutePath(&abs_path))
+  base::FilePath abs_path(base::MakeAbsoluteFilePath(file_path));
+  if (abs_path.empty())
     return false;
 
   std::string png_data;
   return file_util::ReadFileToString(abs_path, &png_data) &&
          gfx::PNGCodec::Decode(reinterpret_cast<unsigned char*>(&png_data[0]),
                                png_data.length(),
                                bitmap);
 }
 
 // Encodes a bitmap into a PNG and write to disk. Returns true on success. The
@@ skipping 483 matching lines @@
 
   gfx::Size container_size(400, 300);
   base::FilePath url =
       test_data_dir().AppendASCII("pixel_browser_plugin.html");
   RunPixelTest(container_size, url, ref_img_revision_update,
                ref_pixels, ref_pixel_count);
 }
 
 }  // namespace content