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

chrome/browser/media_galleries/media_galleries_preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
@@ skipping 345 matching lines @@
     on_initialize_callbacks_.push_back(callback);
   }
 
   if (initializing_)
     return;
 
   initializing_ = true;
 
   AddDefaultGalleriesIfFreshProfile();
 
-  pre_initialization_callbacks_waiting_ = 2;
+  pre_initialization_callbacks_waiting_ = 3;
 
   // Ensure StorageMonitor is initialized.
   StorageMonitor::GetInstance()->EnsureInitialized(
       base::Bind(&MediaGalleriesPreferences::OnInitializationCallbackReturned,
                  weak_factory_.GetWeakPtr()));
 
   // Look for optional default galleries every time.
   itunes::ITunesFinder::FindITunesLibrary(
       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_; }
 
 Profile* MediaGalleriesPreferences::profile() { return profile_; }
 
 void MediaGalleriesPreferences::OnInitializationCallbackReturned() {
   DCHECK(!IsInitialized());
   DCHECK(pre_initialization_callbacks_waiting_ > 0);
   if (--pre_initialization_callbacks_waiting_ == 0)
@@ skipping 99 matching lines @@
                           gallery_change_observers_,
                           OnGalleryInfoUpdated(this, pref_id));
       }
       return true;
     }
   }
   return false;
 }
 
 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))
       gallery_name = kITunesGalleryName;
     else if (StorageInfo::IsPicasaDevice(device_id))
       gallery_name = kPicasaGalleryName;
     else
       NOTREACHED();
 
     AddGalleryInternal(device_id, ASCIIToUTF16(gallery_name),
@@ skipping 535 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }