Media Galleries API Picasa: End-to-end browsertest.

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 d07e80c59971fb68af280b5bca47f635ccccd8ea..72f71b7175008e1810d32625d385a856dd7bed7f 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -83,18 +83,25 @@ void EnsureMediaDirectoriesExists::Init() {
   ASSERT_TRUE(fake_dir_.CreateUniqueTempDir());
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
-  // This is to make sure the tests don't think iTunes is installed (unless
-  // we control it specifically).
-  appdir_override_.reset(new base::ScopedPathOverride(
-      base::DIR_APP_DATA, fake_dir_.path().AppendASCII("itunes")));
+  // This is to control whether or not tests think iTunes and Picasa are
+  // installed.
+  app_data_override_.reset(new base::ScopedPathOverride(
+      base::DIR_APP_DATA, fake_dir_.path().AppendASCII("appdata")));
+
+#if defined(OS_WIN)
+  // Picasa on Windows is in the DIR_LOCAL_APP_DATA directory.
+  local_app_data_override_.reset(new base::ScopedPathOverride(
+      base::DIR_LOCAL_APP_DATA,
+      fake_dir_.path().AppendASCII("local_app_data")));
+#endif
 #endif
 
   music_override_.reset(new base::ScopedPathOverride(
-    chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music")));
+      chrome::DIR_USER_MUSIC, fake_dir_.path().AppendASCII("music")));
   pictures_override_.reset(new base::ScopedPathOverride(
-    chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures")));
+      chrome::DIR_USER_PICTURES, fake_dir_.path().AppendASCII("pictures")));
   video_override_.reset(new base::ScopedPathOverride(
-    chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos")));
+      chrome::DIR_USER_VIDEOS, fake_dir_.path().AppendASCII("videos")));
   num_galleries_ = 3;
 #endif
 }