[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/media_galleries/media_file_system_registry.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.
 
 // MediaFileSystemRegistry registers pictures directories and media devices as
 // File API filesystems and keeps track of the path to filesystem ID mappings.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/media_galleries/mtp_device_delegate_impl.h"
 #include "chrome/browser/storage_monitor/removable_storage_observer.h"
 
 class Profile;
 
 namespace content {
 class RenderViewHost;
 }
@@ skipping 37 matching lines @@
     MediaFileSystemsCallback;
 
 class MediaFileSystemRegistry : public RemovableStorageObserver {
  public:
   MediaFileSystemRegistry();
   virtual ~MediaFileSystemRegistry();
 
   // Passes to |callback| the list of media filesystem IDs and paths for a
   // given RVH. Called on the UI thread.
   void GetMediaFileSystemsForExtension(
-      const content::RenderViewHost* rvh,
+      content::RenderViewHost* rvh,
       const extensions::Extension* extension,
       const MediaFileSystemsCallback& callback);
 
-  // Returns the initialized media galleries preferences for the specified
-  // |profile|. This method should be used instead of calling
-  // MediaGalleriesPreferences directly because this method also ensures that
-  // currently attached removable devices are added to the preferences.
+  // This method should be used instead of calling MediaGalleriesPreferences
+  // directly because this method also ensures that currently attached
+  // removable devices are added to the preferences.
   // Called on the UI thread.
-  MediaGalleriesPreferences* GetPreferences(Profile* profile);
+  // Note: Caller must ensure that the storage monitor is initialized before
+  // calling this method.
+  virtual MediaGalleriesPreferences* GetPreferences(Profile* profile) OVERRIDE;

[vandebo (ex-Chrome), 2013/05/23 15:04:17]

Not an override.  Does it need to be virtual?

[Greg Billock, 2013/05/30 22:17:47]

Reverted this. (Was from the ::Vendor class I had before).

 
   // RemovableStorageObserver implementation.
   virtual void OnRemovableStorageDetached(const StorageInfo& info) OVERRIDE;
 
   size_t GetExtensionGalleriesHostCountForTests() const;
 
   // See TransientDeviceIds::GetTransientIdForDeviceId().
   uint64 GetTransientIdForDeviceId(const std::string& device_id);
 
  private:
   friend class TestMediaFileSystemContext;
   class MediaFileSystemContextImpl;
 
+  // Bottom half of |GetMediaFileSystemsForExtension|. Called when the
+  // storage monitor is fully initialized.
+  void GetMediaFileSystemsPostInit(const content::RenderViewHost* rvh,
+                                   const extensions::Extension* extension,
+                                   const MediaFileSystemsCallback& callback);
+
   // Map an extension to the ExtensionGalleriesHost.
   typedef std::map<std::string /*extension_id*/,
                    scoped_refptr<ExtensionGalleriesHost> > ExtensionHostMap;
   // Map a profile and extension to the ExtensionGalleriesHost.
   typedef std::map<Profile*, ExtensionHostMap> ExtensionGalleriesHostMap;
   // Map a profile to a PrefChangeRegistrar.
   typedef std::map<Profile*, PrefChangeRegistrar*> PrefChangeRegistrarMap;
 
   // Map a MTP or PTP device location to the raw pointer of
   // ScopedMTPDeviceMapEntry. It is safe to store a raw pointer in this
@@ skipping 19 matching lines @@
   // ExtensionGalleriesHost objects created.
   ExtensionGalleriesHostMap extension_hosts_map_;
 
   PrefChangeRegistrarMap pref_change_registrar_map_;
 
   // Only accessed on the UI thread.
   MTPDeviceDelegateMap mtp_device_delegate_map_;
 
   scoped_ptr<MediaFileSystemContext> file_system_context_;
 
+  base::WeakPtrFactory<MediaFileSystemRegistry> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_FILE_SYSTEM_REGISTRY_H_