Media Galleries API Picasa: End-to-end browsertest.

chrome/browser/media_galleries/fileapi/picasa_finder.cc

Index: chrome/browser/media_galleries/fileapi/picasa_finder.cc
diff --git a/chrome/browser/media_galleries/fileapi/picasa_finder.cc b/chrome/browser/media_galleries/fileapi/picasa_finder.cc
index 86b4e12599bded872266e7ee7ac6e550588fe6de..e6f4d9712058e78ba1314039abf4dbaebfe095ec 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_finder.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_finder.cc
@@ -14,12 +14,7 @@
 
 namespace picasa {
 
-namespace {
-
-// Returns path of Picasa's DB3 database directory. May only be called on
-// threads that allow for disk IO, like the FILE thread or MediaTaskRunner.
-base::FilePath FindPicasaDatabaseOnFileThread() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+base::FilePath PicasaFinder::GetPicasaDatabasePath() {
   base::FilePath path;
 
 #if defined(OS_WIN)
@@ -34,8 +29,17 @@ base::FilePath FindPicasaDatabaseOnFileThread() {
   return base::FilePath();
 #endif
 
-  path = path.AppendASCII("Google").AppendASCII("Picasa2")
-             .AppendASCII(kPicasaDatabaseDirName);
+  return path.AppendASCII("Google").AppendASCII("Picasa2").AppendASCII(
+      kPicasaDatabaseDirName);
+}
+
+namespace {
+
+// Returns path of Picasa's DB3 database directory. May only be called on
+// threads that allow for disk IO, like the FILE thread or MediaTaskRunner.
+base::FilePath FindPicasaDatabaseOnFileThread() {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  base::FilePath path = PicasaFinder::GetPicasaDatabasePath();
 
   // Verify actual existence
   if (!base::DirectoryExists(path))