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..1c12e3cd1b1c51f2119d624b6840d6c0421594a6 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_finder.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_finder.cc
@@ -34,8 +34,8 @@ base::FilePath FindPicasaDatabaseOnFileThread() {
   return base::FilePath();
 #endif
 
-  path = path.AppendASCII("Google").AppendASCII("Picasa2")
-             .AppendASCII(kPicasaDatabaseDirName);
+  return path.AppendASCII("Google").AppendASCII("Picasa2").AppendASCII(
+      kPicasaDatabaseDirName);
 
   // Verify actual existence
   if (!base::DirectoryExists(path))
@@ -53,8 +53,9 @@ void FinishOnOriginalThread(const PicasaFinder::DeviceIDCallback& callback,
 
 }  // namespace
 
-void PicasaFinder::FindPicasaDatabase(
-    const PicasaFinder::DeviceIDCallback& callback) {
+namespace PicasaFinder {
+
+void FindPicasaDatabase(const PicasaFinder::DeviceIDCallback& callback) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
@@ -62,4 +63,6 @@ void PicasaFinder::FindPicasaDatabase(
       base::Bind(&FinishOnOriginalThread, callback));
 }
 
+}  // namespace PicasaFinder
+
 }  // namespace picasa