Media Galleries API Picasa: Windows Custom Database Locations

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 af538a72ed4fa7943d670911d75e363609ac3fec..b5eaa5f27f6c230e874f6898af9fdc1173e40e07 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -4,6 +4,10 @@
 
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ -12,12 +16,18 @@
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_WIN)
+#include "base/test/test_reg_util_win.h"
+#include "base/win/registry.h"
+#endif
+
 scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
     const std::string& name,
     const std::vector<std::string>& media_galleries_permissions,
@@ -85,6 +95,14 @@ base::FilePath EnsureMediaDirectoriesExists::GetFakeLocalAppDataPath() const {
   DCHECK(fake_dir_.IsValid());
   return fake_dir_.path().AppendASCII("localappdata");
 }
+
+void EnsureMediaDirectoriesExists::WriteCustomPicasaAppDataPathToRegistry(
+    const base::FilePath& path) {
+  base::win::RegKey key;
+  base::win::RegKey(HKEY_CURRENT_USER, picasa::kPicasaRegistryPath,
+                    KEY_SET_VALUE)
+      .WriteValue(picasa::kPicasaRegistryAppDataKey, path.value().c_str());
+}
 #endif
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
@@ -108,9 +126,11 @@ void EnsureMediaDirectoriesExists::Init() {
   app_data_override_.reset(new base::ScopedPathOverride(
       base::DIR_APP_DATA, GetFakeAppDataPath()));
 #if defined(OS_WIN)
-  // Picasa on Windows is in the DIR_LOCAL_APP_DATA directory.
+  // Picasa on Windows is by default in the DIR_LOCAL_APP_DATA directory.
   local_app_data_override_.reset(new base::ScopedPathOverride(
       base::DIR_LOCAL_APP_DATA, GetFakeLocalAppDataPath()));
+  // Picasa also looks in the registry for an alternate path.
+  registry_override_.OverrideRegistry(HKEY_CURRENT_USER, L"hkcu_picasa");
 #endif
 #endif