From 2a99a7e74a7f215066514fe81d2bfa6639d9eddd Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Thu, 28 Mar 2013 15:31:22 +0000 Subject: Merge from Chromium at DEPS revision r190564 This commit was generated by merge_to_master.py. Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170 --- content/browser/download/file_metadata_unittest_linux.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'content/browser/download/file_metadata_unittest_linux.cc') diff --git a/content/browser/download/file_metadata_unittest_linux.cc b/content/browser/download/file_metadata_unittest_linux.cc index ec2041a6c1..504f130d86 100644 --- a/content/browser/download/file_metadata_unittest_linux.cc +++ b/content/browser/download/file_metadata_unittest_linux.cc @@ -10,11 +10,11 @@ #include #include -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" -#include "base/scoped_temp_dir.h" -#include "base/string_split.h" +#include "base/strings/string_split.h" #include "content/browser/download/file_metadata_linux.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -32,7 +32,7 @@ class FileMetadataLinuxTest : public testing::Test { : source_url_("http://www.source.com"), referrer_url_("http://www.referrer.com") {} - const FilePath& test_file() const { + const base::FilePath& test_file() const { return test_file_; } @@ -104,8 +104,8 @@ class FileMetadataLinuxTest : public testing::Test { } private: - ScopedTempDir temp_dir_; - FilePath test_file_; + base::ScopedTempDir temp_dir_; + base::FilePath test_file_; GURL source_url_; GURL referrer_url_; bool is_xattr_supported_; -- cgit v1.2.3