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

chrome/browser/media_galleries/media_galleries_test_util.h

Index: chrome/browser/media_galleries/media_galleries_test_util.h
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.h b/chrome/browser/media_galleries/media_galleries_test_util.h
index 3a7864339506caced413426650e81bdd6910334e..f3cf1b714fdcf46d3fb4ede133d3b369d27ea996 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.h
+++ b/chrome/browser/media_galleries/media_galleries_test_util.h
@@ -8,6 +8,8 @@
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/test/scoped_path_override.h"
 
 namespace extensions {
 class Extension;
@@ -25,6 +27,7 @@ scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
 class EnsureMediaDirectoriesExists {
  public:
   EnsureMediaDirectoriesExists();
+  virtual ~EnsureMediaDirectoriesExists();

[Lei Zhang, 2013/06/20 22:10:18]

not virtual

[Greg Billock, 2013/06/20 23:30:56]

Done.

 
   int num_galleries() const { return num_galleries_; }
 
@@ -35,6 +38,11 @@ class EnsureMediaDirectoriesExists {
 
   int num_galleries_;
 
+  scoped_ptr<base::ScopedPathOverride> appdir_override_;
+  scoped_ptr<base::ScopedPathOverride> music_override_;
+  scoped_ptr<base::ScopedPathOverride> pictures_override_;
+  scoped_ptr<base::ScopedPathOverride> video_override_;
+
   DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists);
 };