Media Galleries API: Use Scheduler in MediaGalleriesPreferences initialization.

chrome/browser/media_galleries/media_galleries_preferences.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 215 matching lines @@
   static bool APIHasBeenUsed(Profile* profile);
 
  private:
   friend class MediaGalleriesPreferencesTest;
   friend class MediaGalleriesPermissionsTest;
 
   typedef std::map<std::string /*device id*/, MediaGalleryPrefIdSet>
       DeviceIdPrefIdsMap;
 
   // These must be called on the UI thread.
-  void OnInitializationCallbackReturned();
   void FinishInitialization();
 
   // Populates the default galleries if this is a fresh profile.
   void AddDefaultGalleriesIfFreshProfile();
 
   // This is a hack - Some devices (iTunes, Picasa) are singletons in that only
   // one instance of that type is supported at a time. As such, the device id
   // should just be "itunes:" or "picasa:" but that would mean finding the
   // location of the database file multiple times, which may be an async
   // operation. Storing the location of the backing database in the device
   // id allows that look up to be avoided. However, the cost is that if the
   // database moves, the device id in preferences has to be updated.  This
   // method searches for a gallery of the type passed in and updates its
   // device id.  It returns true if the device id is up to date.
   bool UpdateDeviceIDForSingletonType(const std::string& device_id);
 
   // Handle an iTunes or Picasa finder returning a device ID to us.
-  void OnFinderDeviceID(const std::string& device_id);
+  // |callback| is called once it's done, if it's non-null.
+  void OnFinderDeviceID(base::Closure callback, const std::string& device_id);
 
   // Builds |known_galleries_| from the persistent store.
   void InitFromPrefs();
 
   MediaGalleryPrefId AddGalleryInternal(const std::string& device_id,
                                         const string16& display_name,
                                         const base::FilePath& relative_path,
                                         bool user_added,
                                         const string16& volume_label,
                                         const string16& vendor_name,
@@ skipping 33 matching lines @@
   void SetExtensionPrefsForTesting(extensions::ExtensionPrefs* extension_prefs);
 
   base::WeakPtrFactory<MediaGalleriesPreferences> weak_factory_;
 
   // Used to make sure we call initialize from the same thread as creation.
   base::ThreadChecker thread_checker_;
 
   bool initializing_;
   bool initialized_;
   std::vector<base::Closure> on_initialize_callbacks_;
-  int pre_initialization_callbacks_waiting_;
 
   // The profile that owns |this|.
   Profile* profile_;
 
   // The ExtensionPrefs used in a testing environment, where
   // BrowserContextKeyedServices aren't used. This will be NULL unless it is
   // set with SetExtensionPrefsForTesting().
   extensions::ExtensionPrefs* extension_prefs_for_testing_;
 
   // An in-memory cache of known galleries.
   MediaGalleriesPrefInfoMap known_galleries_;
 
   // A mapping from device id to the set of gallery pref ids on that device.
   // All pref ids in |device_map_| are also in |known_galleries_|.
   DeviceIdPrefIdsMap device_map_;
 
   ObserverList<GalleryChangeObserver> gallery_change_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPreferences);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_PREFERENCES_H_