[MediaGalleries] Mock the app data dir on Windows/Mac

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 a3e42fbc92dc7d05b27549a44c20064a5723e892..506720fbdefe370bb909d72928e2721b8854d0a0 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 
+#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ -90,6 +91,13 @@ void EnsureMediaDirectoriesExists::Init() {
   };
 
   for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
+    // This is to make sure the tests don't think iTunes is installed (unless
+    // we control it specifically).
+#if defined(OS_WIN) || defined(OS_MACOSX)
+    PathService::OverrideAndCreateIfNeeded(

[Lei Zhang, 2013/06/18 19:57:17]

You can just use PathService::Override(), which is the same as
OverrideAndCreateIfNeeded(...., true).

[Greg Billock, 2013/06/19 05:13:15]

Switched to using ScopedPathOverride, but was having all kinds of trouble with
my win checkout to get it tested, so I haven't uploaded it yet. It ends up
looking quite different. (SPO uses Override(), which I also figured out is doing
this.)

[Lei Zhang, 2013/06/19 05:18:54]

Doh, ping me when there's a patch set 2 and I'll take a look.

+        base::DIR_APP_DATA, fake_dir_.path().AppendASCII("itunes"), true);
+#endif
+
     PathService::OverrideAndCreateIfNeeded(
         kDirectoryKeys[i], fake_dir_.path().AppendASCII(kDirectoryNames[i]),
         true /*create*/);