Media Galleries API Picasa: Windows Custom Database Locations

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 1c511582ad972bfd3c86dd67d05b8f02dd98b639..2e7bee0221dccfe6b1007b426359cc65d1ded4ae 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.h
+++ b/chrome/browser/media_galleries/media_galleries_test_util.h
@@ -11,10 +11,18 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/test/scoped_path_override.h"
 
+#if defined(OS_WIN)
+#include "base/test/test_reg_util_win.h"
+#endif
+
 namespace extensions {
 class Extension;
 }
 
+namespace registry_util {
+class RegistryOverrideManager;
+}
+
 class Profile;
 
 scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
@@ -32,6 +40,7 @@ class EnsureMediaDirectoriesExists {
   base::FilePath GetFakeAppDataPath() const;
 #if defined(OS_WIN)
   base::FilePath GetFakeLocalAppDataPath() const;
+  void WriteCustomPicasaAppDataPathToRegistry(const base::FilePath& path);
 #endif
 #if defined(OS_WIN) || defined(OS_MACOSX)
   base::FilePath GetFakePicasaFoldersRootPath() const;
@@ -50,6 +59,8 @@ class EnsureMediaDirectoriesExists {
   scoped_ptr<base::ScopedPathOverride> video_override_;
 #if defined(OS_WIN)
   scoped_ptr<base::ScopedPathOverride> local_app_data_override_;
+
+  registry_util::RegistryOverrideManager registry_override_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(EnsureMediaDirectoriesExists);