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..c922e99355ec86679aedb29e950afce0a3707d7e 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.h
+++ b/chrome/browser/media_galleries/media_galleries_test_util.h
@@ -10,11 +10,16 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/scoped_path_override.h"
+#include "base/test/test_reg_util_win.h"
 
 namespace extensions {
 class Extension;
 }
 
+namespace registry_util {
+class RegistryOverrideManager;
+}
+
 class Profile;
 
 scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
@@ -32,6 +37,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 +56,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);