Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9609)

Unified Diff: chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc

Issue 185393012: Change media galleries to external file system type to add toURL support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 43a09bea0ad5880d622439b54a88bfbcbda31033..11b597367d0597394f0bead9fb7509900c46a181 100644
--- a/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
+++ b/chrome/browser/media_galleries/fileapi/itunes_file_util_unittest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/media_galleries/fileapi/itunes_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"
@@ -153,6 +154,7 @@ class ItunesFileUtilTest : public testing::Test {
virtual void SetUp() OVERRIDE {
ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
+ ImportedMediaGalleryRegistry::GetInstance()->Initialize();
scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
new quota::MockSpecialStoragePolicy();
@@ -197,10 +199,14 @@ class ItunesFileUtilTest : 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("itunes");
+ virtual_path = virtual_path.AppendASCII(path);
return file_system_context_->CreateCrackedFileSystemURL(
GURL("http://www.example.com"), fileapi::kFileSystemTypeItunes,
- base::FilePath::FromUTF8Unsafe(virtual_path));
+ virtual_path);
}
fileapi::FileSystemOperationRunner* operation_runner() const {

Powered by Google App Engine
This is Rietveld 408576698