Revert 226509 "Media Galleries API: Fix MediaGalleriesPreference..."

trunk/src/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 359 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_ = 3;
 
-  // We determine the freshness of the profile here, before any of the finders
-  // return and add media galleries to it.
+  // Ensure StorageMonitor is initialized.
   StorageMonitor::GetInstance()->EnsureInitialized(
-      base::Bind(&MediaGalleriesPreferences::OnStorageMonitorInit,
-                 weak_factory_.GetWeakPtr(),
-                 APIHasBeenUsed(profile_) /* add_default_galleries */));
+      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()));
 
@@ skipping 16 matching lines @@
 }
 
 void MediaGalleriesPreferences::FinishInitialization() {
   DCHECK(!IsInitialized());
 
   initialized_ = true;
 
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   DCHECK(monitor->IsInitialized());
 
+  AddDefaultGalleriesIfFreshProfile();
   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;
     AddGallery(existing_devices[i].device_id(),
                base::FilePath(),
                false,
                existing_devices[i].storage_label(),
                existing_devices[i].vendor_name(),
                existing_devices[i].model_name(),
                existing_devices[i].total_size_in_bytes(),
                base::Time::Now());
   }
 
   for (std::vector<base::Closure>::iterator iter =
            on_initialize_callbacks_.begin();
        iter != on_initialize_callbacks_.end();
        ++iter) {
     iter->Run();
   }
   on_initialize_callbacks_.clear();
 }
 
-void MediaGalleriesPreferences::AddDefaultGalleries() {
+void MediaGalleriesPreferences::AddDefaultGalleriesIfFreshProfile() {
+  // Only add defaults the first time.
+  if (APIHasBeenUsed(profile_))
+    return;
+
+  // Fresh profile case.
   const int kDirectoryKeys[] = {
     chrome::DIR_USER_MUSIC,
     chrome::DIR_USER_PICTURES,
     chrome::DIR_USER_VIDEOS,
   };
 
   for (size_t i = 0; i < arraysize(kDirectoryKeys); ++i) {
     base::FilePath path;
     if (!PathService::Get(kDirectoryKeys[i], &path))
       continue;
@@ skipping 42 matching lines @@
         FOR_EACH_OBSERVER(GalleryChangeObserver,
                           gallery_change_observers_,
                           OnGalleryInfoUpdated(this, pref_id));
       }
       return true;
     }
   }
   return false;
 }
 
-void MediaGalleriesPreferences::OnStorageMonitorInit(
-    bool need_to_add_default_galleries) {
-  if (need_to_add_default_galleries)
-    AddDefaultGalleries();
-  OnInitializationCallbackReturned();
-}
-
 void MediaGalleriesPreferences::OnFinderDeviceID(const std::string& device_id) {
   if (!device_id.empty() && !UpdateDeviceIDForSingletonType(device_id)) {
     std::string gallery_name;
     if (StorageInfo::IsIPhotoDevice(device_id))
       gallery_name = kIPhotoGalleryName;
     else if (StorageInfo::IsITunesDevice(device_id))
       gallery_name = kITunesGalleryName;
     else if (StorageInfo::IsPicasaDevice(device_id))
       gallery_name = kPicasaGalleryName;
     else
@@ skipping 540 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;
 }