Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/media_galleries/media_galleries_dialog_controller.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_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 95 matching lines @@
   explicit MediaGalleriesDialogController(
       const extensions::Extension& extension);
 
   virtual ~MediaGalleriesDialogController();
 
  private:
   // This type keeps track of media galleries already known to the prefs system.
   typedef std::map<MediaGalleryPrefId, GalleryPermission>
       KnownGalleryPermissions;
 
-  // Bottom half of constructor -- called when the storage monitor
-  // is initialized.
-  void OnStorageMonitorInitialized();
+  // Bottom half of constructor -- called when |preferences_| is initialized.
+  void OnPreferencesInitialized();
 
   // SelectFileDialog::Listener implementation:
   virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE;
 
   // RemovableStorageObserver implementation.
   // Used to keep dialog in sync with removable device status.
   virtual void OnRemovableStorageAttached(const StorageInfo& info) OVERRIDE;
   virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;
@@ skipping 61 matching lines @@
 
   // The view that's showing.
   scoped_ptr<MediaGalleriesDialog> dialog_;
 
   scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogController);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_