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 67fbf220b755212df900a9a85534485cc37e8561..2d5a9fab2c57029abc01af1162b8fd50f0ccc62b 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -363,7 +363,7 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
 
   AddDefaultGalleriesIfFreshProfile();
 
-  pre_initialization_callbacks_waiting_ = 2;
+  pre_initialization_callbacks_waiting_ = 3;
 
   // Ensure StorageMonitor is initialized.
   StorageMonitor::GetInstance()->EnsureInitialized(
@@ -375,12 +375,9 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 
-  // TODO(tommycli): Turn on when Picasa code is ready.
-#if 0
-  picasa::PicasaFinder::FindPicasaDatabaseOnUIThread(
+  picasa::FindPicasaDatabase(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
-#endif
 }
 
 bool MediaGalleriesPreferences::IsInitialized() const { return initialized_; }
@@ -500,6 +497,7 @@ bool MediaGalleriesPreferences::UpdateDeviceIDForSingletonType(
 }
 
 void MediaGalleriesPreferences::OnFinderDeviceID(const std::string& device_id) {
+  DLOG(INFO) << "OnFinderDeviceID: " << device_id;

[vandebo (ex-Chrome), 2013/09/23 16:01:31]

remove

[tommycli, 2013/09/24 00:42:36]

Done.

   if (!device_id.empty() && !UpdateDeviceIDForSingletonType(device_id)) {
     std::string gallery_name;
     if (StorageInfo::IsITunesDevice(device_id))