Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/extensions/api/media_galleries/media_galleries_api.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.
 
 // Defines the Chrome Extensions Media Galleries API functions for accessing
 // user's media files, as specified in the extension API IDL.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_H_
 
@@ skipping 11 matching lines @@
     : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleries.getMediaFileSystems",
                              MEDIAGALLERIES_GETMEDIAFILESYSTEMS)
 
  protected:
   virtual ~MediaGalleriesGetMediaFileSystemsFunction();
   virtual bool RunImpl() OVERRIDE;
 
  private:
-  // Bottom half for RunImpl, invoked after the storage monitor is initialized.
-  void OnStorageMonitorInit(
+  // Bottom half for RunImpl, invoked after the preferences is initialized.
+  void OnPreferencesInit(
     MediaGalleries::GetMediaFileSystemsInteractivity interactive);
 
   // Always show the dialog.
   void AlwaysShowDialog(const std::vector<MediaFileSystemInfo>& filesystems);
 
   // If no galleries are found, show the dialog, otherwise return them.
   void ShowDialogIfNoGalleries(
       const std::vector<MediaFileSystemInfo>& filesystems);
 
   // Grabs galleries from the media file system registry and passes them to
   // |ReturnGalleries|.
   void GetAndReturnGalleries();
 
   // Returns galleries to the caller.
   void ReturnGalleries(const std::vector<MediaFileSystemInfo>& filesystems);
 
   // Shows the configuration dialog to edit gallery preferences.
   void ShowDialog();
 
   // A helper method that calls
   // MediaFileSystemRegistry::GetMediaFileSystemsForExtension().
   void GetMediaFileSystemsForExtension(const MediaFileSystemsCallback& cb);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_MEDIA_GALLERIES_API_H_