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/base_paths_posix.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
@@ skipping 357 matching lines @@
   }
 
   on_initialize_callbacks_.push_back(callback);
   if (on_initialize_callbacks_.size() > 1)
     return;
 
   // This counter must match the number of async methods dispatched below.
   // 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(
       base::Bind(&MediaGalleriesPreferences::OnInitializationCallbackReturned,
                  weak_factory_.GetWeakPtr()));
 
   // Look for optional default galleries every time.
   itunes::ITunesFinder::FindITunesLibrary(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 
+  picasa::FindPicasaDatabase(
+      base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
+                 weak_factory_.GetWeakPtr()));
+
 #if 0
   iphoto::FindIPhotoLibrary(
       base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
                  weak_factory_.GetWeakPtr()));
 #endif
-
-  // TODO(tommycli): Turn on when Picasa code is ready.
-#if 0
-  picasa::PicasaFinder::FindPicasaDatabaseOnUIThread(
-      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)
     FinishInitialization();
 }
 
 void MediaGalleriesPreferences::FinishInitialization() {
   DCHECK(!IsInitialized());
 
   initialized_ = true;
 
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   DCHECK(monitor->IsInitialized());
 
   AddDefaultGalleriesIfFreshProfile();

[vandebo (ex-Chrome), 2013/10/01 16:41:10]

This won't work in this location.  You may have added itunes and picasa by this
point so the detection for fresh profile will always say no.

[tommycli, 2013/10/01 17:11:42]

You're right. Fix in this CL:
https://codereview.chromium.org/25539003/

[vandebo (ex-Chrome), 2013/10/01 17:35:32]

Don't include in this CL.

   InitFromPrefs();
 
   StorageMonitor::GetInstance()->AddObserver(this);
 
   std::vector<StorageInfo> existing_devices =
       monitor->GetAllAvailableStorages();
   for (size_t i = 0; i < existing_devices.size(); i++) {
     if (!(StorageInfo::IsMediaDevice(existing_devices[i].device_id()) &&
           StorageInfo::IsRemovableDevice(existing_devices[i].device_id())))
       continue;
@@ skipping 637 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;
 }