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

chrome/browser/media_galleries/media_galleries_preferences.cc

Index: chrome/browser/media_galleries/media_galleries_preferences.cc
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc
index a6e4d0782665bc94ed06743e46e43f3b9b65350e..7e29bd784ce860bd81ec08a72d06d8445bede24a 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -375,7 +375,7 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
   // It cannot be incremented inline with each callback, as some may return
   // synchronously, decrement the counter to 0, and prematurely trigger
   // FinishInitialization.
-  pre_initialization_callbacks_waiting_ = 2;
+  pre_initialization_callbacks_waiting_ = 3;
 
   // We determine the freshness of the profile here, before any of the finders
   // return and add media galleries to it.
@@ -389,15 +389,12 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 
-#if 0
-  iphoto::FindIPhotoLibrary(
+  picasa::FindPicasaDatabase(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 
-  // TODO(tommycli): Turn on when Picasa code is ready.
 #if 0
-  picasa::PicasaFinder::FindPicasaDatabaseOnUIThread(
+  iphoto::FindIPhotoLibrary(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 #endif