| Index: chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| index 9f9323c57721757259e1f4a7eed92e696b2fbd20..fc424acaef05ae6962eb7289f50efea69deb83b7 100644
|
| --- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
|
| @@ -83,7 +83,7 @@ class TestITunesDataProvider : public ITunesDataProvider {
|
| }
|
|
|
| const base::FilePath& auto_add_path() const override {
|
| - return fake_auto_add_dir_.path();
|
| + return fake_auto_add_dir_.GetPath();
|
| }
|
|
|
| void SetProvideAutoAddDir(bool provide_auto_add_dir) {
|
| @@ -143,15 +143,12 @@ class ItunesFileUtilTest : public testing::Test {
|
|
|
| void SetUpDataProvider() {
|
| ASSERT_TRUE(fake_library_dir_.CreateUniqueTempDir());
|
| - ASSERT_EQ(
|
| - 0,
|
| - base::WriteFile(
|
| - fake_library_dir_.path().AppendASCII(kITunesLibraryXML),
|
| - NULL,
|
| - 0));
|
| + ASSERT_EQ(0, base::WriteFile(
|
| + fake_library_dir_.GetPath().AppendASCII(kITunesLibraryXML),
|
| + NULL, 0));
|
|
|
| itunes_data_provider_.reset(
|
| - new TestITunesDataProvider(fake_library_dir_.path()));
|
| + new TestITunesDataProvider(fake_library_dir_.GetPath()));
|
| }
|
|
|
| void SetUp() override {
|
| @@ -176,7 +173,7 @@ class ItunesFileUtilTest : public testing::Test {
|
| media_path_filter_.reset(new MediaPathFilter());
|
| ScopedVector<storage::FileSystemBackend> additional_providers;
|
| additional_providers.push_back(new TestMediaFileSystemBackend(
|
| - profile_dir_.path(),
|
| + profile_dir_.GetPath(),
|
| new TestITunesFileUtil(media_path_filter_.get(),
|
| itunes_data_provider_.get())));
|
|
|
| @@ -185,8 +182,8 @@ class ItunesFileUtilTest : public testing::Test {
|
| base::ThreadTaskRunnerHandle::Get().get(),
|
| storage::ExternalMountPoints::CreateRefCounted().get(),
|
| storage_policy.get(), NULL, std::move(additional_providers),
|
| - std::vector<storage::URLRequestAutoMountHandler>(), profile_dir_.path(),
|
| - content::CreateAllowFileAccessOptions());
|
| + std::vector<storage::URLRequestAutoMountHandler>(),
|
| + profile_dir_.GetPath(), content::CreateAllowFileAccessOptions());
|
| }
|
|
|
| protected:
|
|
|