Media Galleries API: Fix MediaGalleriesPreferences finders race.

chrome/browser/storage_monitor/storage_monitor.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_STORAGE_MONITOR_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 18 matching lines @@
 class MediaTransferProtocolManager;
 }
 
 // Base class for platform-specific instances watching for removable storage
 // attachments/detachments.
 // Lifecycle contracts: This class is created in the browser process
 // before the profile is initialized, so listeners can be
 // created during profile construction. The platform-specific initialization,
 // which can lead to calling registered listeners with notifications of
 // attached volumes, are done lazily at first use through the async
-// |Initialize()| method. That must be done before any of the registered
+// |EnsureInitialized()| method. That must be done before any of the registered
 // listeners will receive updates or calls to other API methods return
 // meaningful results.
 // A post-initialization |GetAttachedStorage()| call coupled with a
 // registered listener will receive a complete set, albeit potentially with
 // duplicates. This is because there's no tracking between when listeners were
 // registered and the state of initialization, and the fact that platforms
 // behave differently in how these notifications are provided.
 class StorageMonitor {
  public:
   // This interface is provided to generators of storage notifications.
@@ skipping 19 matching lines @@
   static StorageMonitor* Create();
 
   // Returns a pointer to an object owned by BrowserProcess, with lifetime
   // starting before main message loop start, and ending after main message loop
   // shutdown. Called outside it's lifetime (or with no browser process),
   // returns NULL.
   static StorageMonitor* GetInstance();
 
   virtual ~StorageMonitor();
 
-  // Ensures that the storage monitor is initialized. The provided callback, If
+  // Ensures that the storage monitor is initialized. The provided callback, if
   // non-null, will be called when initialization is complete. If initialization
   // has already completed, this callback will be invoked within the calling
   // stack. Before the callback is run, calls to |GetAllAvailableStorages| and
   // |GetStorageInfoForPath| may not return the correct results. In addition,
   // registered observers will not be notified on device attachment/detachment.
   // Should be invoked on the UI thread; callbacks will be run on the UI thread.
   void EnsureInitialized(base::Closure callback);
 
   // Return true if the storage monitor has already been initialized.
-  bool IsInitialized();
+  bool IsInitialized() const;
 
   // Finds the device that contains |path| and populates |device_info|.
   // Should be able to handle any path on the local system, not just removable
   // storage. Returns false if unable to find the device.
   virtual bool GetStorageInfoForPath(
       const base::FilePath& path,
       StorageInfo* device_info) const = 0;
 
 // TODO(gbillock): make this either unnecessary (implementation-specific) or
 // platform-independent.
@@ skipping 71 matching lines @@
   // For manipulating storage_map_ structure.
   mutable base::Lock storage_lock_;
 
   // Map of all known storage devices,including fixed and removable storages.
   StorageMap storage_map_;
 
   scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_