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 915f918ccd88e8aed1ebc462718aec1e5320d7b2..4bbd19297bdad28175ba3f6dda1f320bceb58870 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;
 
   // Ensure StorageMonitor is initialized.
   StorageMonitor::GetInstance()->EnsureInitialized(
@@ -387,15 +387,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