diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 21:06:48 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 21:06:48 +0000 |
| commit | 65486ad7c53dd9da35c5464bf8f6ade16bca1f58 (patch) | |
| tree | 54bd4e702efaf01d0abf5c2e2ae4edb4a7cc898a /chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc | |
| parent | 20e7cd1e49135d40d2d84f87358000defbf82cf6 (diff) | |
| download | chromium_src-65486ad7c53dd9da35c5464bf8f6ade16bca1f58.zip chromium_src-65486ad7c53dd9da35c5464bf8f6ade16bca1f58.tar.gz chromium_src-65486ad7c53dd9da35c5464bf8f6ade16bca1f58.tar.bz2 | |
Change media galleries to external file system type to add toURL support
BUG=160900
R=creis@chromium.org, joi@chromium.org, thestig@chromium.org, tsepez@chromium.org, tzik@chromium.org
Review URL: https://codereview.chromium.org/185393012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc')
| -rw-r--r-- | chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc index 645beaf..9ffcceb 100644 --- a/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util_unittest.cc @@ -18,6 +18,7 @@ #include "chrome/browser/media_galleries/fileapi/iphoto_file_util.h" #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h" #include "chrome/browser/media_galleries/fileapi/media_path_filter.h" +#include "chrome/browser/media_galleries/imported_media_gallery_registry.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_file_system_options.h" @@ -185,6 +186,7 @@ class IPhotoFileUtilTest : public testing::Test { virtual void SetUp() OVERRIDE { ASSERT_TRUE(profile_dir_.CreateUniqueTempDir()); + ImportedMediaGalleryRegistry::GetInstance()->Initialize(); scoped_refptr<quota::SpecialStoragePolicy> storage_policy = new quota::MockSpecialStoragePolicy(); @@ -229,10 +231,14 @@ class IPhotoFileUtilTest : public testing::Test { ASSERT_FALSE(completed); } - FileSystemURL CreateURL(const std::string& virtual_path) const { + FileSystemURL CreateURL(const std::string& path) const { + base::FilePath virtual_path = + ImportedMediaGalleryRegistry::GetInstance()->ImportedRoot(); + virtual_path = virtual_path.AppendASCII("iphoto"); + virtual_path = virtual_path.AppendASCII(path); return file_system_context_->CreateCrackedFileSystemURL( GURL("http://www.example.com"), fileapi::kFileSystemTypeIphoto, - base::FilePath::FromUTF8Unsafe(virtual_path)); + virtual_path); } fileapi::FileSystemOperationRunner* operation_runner() const { |