[MediaGalleries] Enable iPhoto gallery

chrome/browser/media_galleries/media_galleries_test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 117 matching lines @@
 #endif // OS_MACOSX
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
 base::FilePath
 EnsureMediaDirectoriesExists::GetFakePicasaFoldersRootPath() const {
   DCHECK(fake_dir_.IsValid());
   return fake_dir_.path().AppendASCII("picasa_folders");
 }
 #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;
 #else
 
   ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // This is to control whether or not tests think iTunes (on Windows) and
   // Picasa are installed.
   app_data_override_.reset(new base::ScopedPathOverride(
       base::DIR_APP_DATA, GetFakeAppDataPath()));
 #endif  // OS_WIN || OS_MACOSX
 
 #if defined(OS_WIN)
   // Picasa on Windows is by default in the DIR_LOCAL_APP_DATA directory.
   local_app_data_override_.reset(new base::ScopedPathOverride(
       base::DIR_LOCAL_APP_DATA, GetFakeLocalAppDataPath()));
   // Picasa also looks in the registry for an alternate path.
   registry_override_.OverrideRegistry(HKEY_CURRENT_USER, L"hkcu_picasa");
 #endif  // OS_WIN
 
 #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(
       base::mac::NSToCFCast(iapps::kITunesRecentDatabasePathsKey),
       base::SysUTF8ToNSString(fake_dir_.path().AppendASCII("itunes").value()),
       false);
 
   // iPhoto override.
   mac_preferences_->AddTestItem(
       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(
       chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music")));
   pictures_override_.reset(new base::ScopedPathOverride(
       chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures")));
   video_override_.reset(new base::ScopedPathOverride(
       chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos")));
   num_galleries_ = 3;
 #endif  // OS_CHROMEOS || OS_ANDROID
 }