Media Galleries API: Use Scheduler in MediaGalleriesPreferences initialization.

chrome/browser/media_galleries/media_galleries_preferences.h

Index: chrome/browser/media_galleries/media_galleries_preferences.h
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.h b/chrome/browser/media_galleries/media_galleries_preferences.h
index 6d9d0f8e6ce062c6fc17b36d2398d1129acf48c3..32bf503d2833c98a2cbf9a5fa5d942113b651012 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.h
+++ b/chrome/browser/media_galleries/media_galleries_preferences.h
@@ -233,7 +233,6 @@ class MediaGalleriesPreferences : public BrowserContextKeyedService,
       DeviceIdPrefIdsMap;
 
   // These must be called on the UI thread.
-  void OnInitializationCallbackReturned();
   void FinishInitialization();
 
   // Populates the default galleries if this is a fresh profile.
@@ -251,7 +250,8 @@ class MediaGalleriesPreferences : public BrowserContextKeyedService,
   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();
@@ -305,7 +305,6 @@ class MediaGalleriesPreferences : public BrowserContextKeyedService,
   bool initializing_;
   bool initialized_;
   std::vector<base::Closure> on_initialize_callbacks_;
-  int pre_initialization_callbacks_waiting_;
 
   // The profile that owns |this|.
   Profile* profile_;