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

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"
 
+#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 66 matching lines @@
     chrome::DIR_USER_VIDEOS,
   };
 
   const char* kDirectoryNames[] = {
     "music",
     "pictures",
     "videos",
   };
 
   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*/);
     base::FilePath path;
     if (PathService::Get(kDirectoryKeys[i], &path) &&
         file_util::DirectoryExists(path)) {
       ++num_galleries_;
     }
   }
   ASSERT_GT(num_galleries_, 0);
 #endif
 }
 
 }  // namespace chrome