[MediaGalleries] Enable iPhoto gallery

chrome/browser/media_galleries/media_galleries_test_util.cc

Index: chrome/browser/media_galleries/media_galleries_test_util.cc
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc
index 692a1230f38cc237a0610f18be6c1e6cf9f77691..5b2c001078c12bb15fffecb11d34bc4c551dcb86 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -135,6 +135,13 @@ EnsureMediaDirectoriesExists::GetFakePicasaFoldersRootPath() const {
 }
 #endif  // OS_WIN || OS_MACOSX
 
+#if defined(OS_MACOSX)
+base::FilePath EnsureMediaDirectoriesExists::GetFakeIPhotoRootPath() const {
+  DCHECK(fake_dir_.IsValid());
+  return fake_dir_.path().AppendASCII("iphoto");
+}
+#endif  // OS_MACOSX
+
 void EnsureMediaDirectoriesExists::Init() {
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   return;
@@ -159,8 +166,10 @@ void EnsureMediaDirectoriesExists::Init() {
 
 #if defined(OS_MACOSX)
   mac_preferences_.reset(new MockPreferences);
-  iapps::SetMacPreferencesForTesting(mac_preferences_.get());
-  picasa::SetMacPreferencesForTesting(mac_preferences_.get());
+
+  // Note that these overrides set a string value, which isn't the right

[vandebo (ex-Chrome), 2014/01/06 18:45:03]

Can you use NSArrayFromFilePath to fix this?

[Greg Billock, 2014/01/07 16:50:55]

Fixed this up a bit.

+  // type (expected to be an array), so overriding them to work requires
+  // converting the path to an array.
 
   // iTunes override.
   mac_preferences_->AddTestItem(
@@ -173,6 +182,9 @@ void EnsureMediaDirectoriesExists::Init() {
       base::mac::NSToCFCast(iapps::kIPhotoRecentDatabasesKey),
       base::SysUTF8ToNSString(fake_dir_.path().AppendASCII("iphoto").value()),
       false);
+
+  iapps::SetMacPreferencesForTesting(mac_preferences_.get());
+  picasa::SetMacPreferencesForTesting(mac_preferences_.get());
 #endif // OS_MACOSX
 
   music_override_.reset(new base::ScopedPathOverride(