Index: chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
index 285c8be0a9ec58b2faece3322238badf2a6df0fc..bd2ba957472fcd09392a5adede5bc751edad5fed 100644 |
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc |
@@ -108,14 +108,14 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { |
if (!temp_dir.CreateUniqueTempDir()) |
return false; |
- if (!base::CopyDirectory(from_dir, temp_dir.path(), true)) |
+ if (!base::CopyDirectory(from_dir, temp_dir.GetPath(), true)) |
return false; |
base::FilePath common_js_path( |
GetCommonDataDir().AppendASCII("common_injected.js")); |
- base::FilePath inject_js_path( |
- temp_dir.path().AppendASCII(extension_name) |
- .AppendASCII("common_injected.js")); |
+ base::FilePath inject_js_path(temp_dir.GetPath() |
+ .AppendASCII(extension_name) |
+ .AppendASCII("common_injected.js")); |
if (!base::CopyFile(common_js_path, inject_js_path)) |
return false; |
@@ -126,7 +126,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { |
custom_arg = json_string.c_str(); |
} |
- base::AutoReset<base::FilePath> reset(&test_data_dir_, temp_dir.path()); |
+ base::AutoReset<base::FilePath> reset(&test_data_dir_, temp_dir.GetPath()); |
bool result = RunPlatformAppTestWithArg(extension_name, custom_arg); |
content::RunAllPendingInMessageLoop(); // avoid race on exit in registry. |
return result; |
@@ -170,8 +170,8 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { |
MediaGalleriesPreferences* preferences = GetAndInitializePreferences(); |
MediaGalleryPrefInfo gallery_info; |
- ASSERT_FALSE(preferences->LookUpGalleryByPath(fake_gallery_temp_dir_.path(), |
- &gallery_info)); |
+ ASSERT_FALSE(preferences->LookUpGalleryByPath( |
+ fake_gallery_temp_dir_.GetPath(), &gallery_info)); |
MediaGalleryPrefId id = preferences->AddGallery( |
gallery_info.device_id, |
gallery_info.path, |
@@ -199,7 +199,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { |
ASSERT_TRUE(base::CopyFile( |
source_path, |
- fake_gallery_temp_dir_.path().Append(source_path.BaseName()))); |
+ fake_gallery_temp_dir_.GetPath().Append(source_path.BaseName()))); |
} |
#if defined(OS_WIN) || defined(OS_MACOSX) |