[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.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.
 
 // GalleryWatchStateTracker tracks the gallery watchers, updates the
 // extension state storage and observes the notification events.
 // GalleryWatchStateTracker lives on the UI thread.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_GALLERY_WATCH_STATE_TRACKER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_GALLERY_WATCH_STATE_TRACKER_H_
@@ skipping 35 matching lines @@
   // Updates the storage for the given extension on the receipt of gallery
   // watch removed event.
   void OnGalleryWatchRemoved(const std::string& extension_id,
                              chrome::MediaGalleryPrefId gallery_id);
 
   // Updates the state of the gallery watchers on the receipt of access
   // permission changed event for the extension specified by the |extension_id|.
   // |has_permission| is set to true if the user granted permission to
   // access the gallery associated with the |gallery_id| and is set to false
   // if the user revoked the gallery permission.
-  void OnGalleryPermissionChanged(const std::string& extension_id,
-                                  chrome::MediaGalleryPrefId gallery_id,
-                                  bool has_permission);
+  void OnGalleryPermissionChanged(

[vandebo (ex-Chrome), 2013/05/22 21:40:34]

Can you base this change on the other, so we don't see the other changes here.

[Greg Billock, 2013/05/23 00:55:59]

Yeah, I'll do that.

+      const std::string& extension_id,
+      chrome::MediaGalleryPrefId gallery_id,
+      bool has_permission,
+      chrome::MediaGalleriesPreferences* preferences);
 
   // Returns a set of watched gallery identifiers for the extension specified
   // by the |extension_id|.
   chrome::MediaGalleryPrefIdSet GetAllWatchedGalleryIDsForExtension(
       const std::string& extension_id) const;
 
   // Removes all the gallery watchers associated with the extension specified
   // by the |extension_id|.
-  void RemoveAllGalleryWatchersForExtension(const std::string& extension_id);
+  void RemoveAllGalleryWatchersForExtension(
+      const std::string& extension_id,
+      chrome::MediaGalleriesPreferences* preferences);
 
  private:
   // Key: Gallery identifier.
   // Value: True if the watcher is active. Watcher will be active only if
   // the extension has access permission to the watched gallery and a watcher
   // has been successfully setup.
   typedef std::map<chrome::MediaGalleryPrefId, bool> WatchedGalleriesMap;
 
   // Key: Extension identifier.
   // Value: Map of watched gallery information.
   typedef std::map<std::string, WatchedGalleriesMap> WatchedExtensionsMap;
 
+  // Bottom half of constructor. Called once the storage monitor is initialized,
+  // and sets up notification observer.
+  void OnStorageMonitorInitialized();
+
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Syncs media gallery watch data for the given extension to/from the state
   // storage.
   void WriteToStorage(const std::string& extension_id);
   void ReadFromStorage(const std::string& extension_id,
                        scoped_ptr<base::Value> value);
 
   // Sets up the gallery watcher on the receipt of granted gallery permission
   // event.
   void SetupGalleryWatch(const std::string& extension_id,
-                         chrome::MediaGalleryPrefId gallery_id);
+                         chrome::MediaGalleryPrefId gallery_id,
+                         chrome::MediaGalleriesPreferences* preferences);
 
   // Removes the gallery watcher on the receipt of revoked gallery permission
   // event.
   void RemoveGalleryWatch(const std::string& extension_id,
-                          chrome::MediaGalleryPrefId gallery_id);
+                          chrome::MediaGalleryPrefId gallery_id,
+                          chrome::MediaGalleriesPreferences* preferences);
 
   // Returns true if a gallery watcher exists for the extension.
   // Set |has_active_watcher| to true to find if the gallery watcher is active.
   bool HasGalleryWatchInfo(const std::string& extension_id,
                            chrome::MediaGalleryPrefId gallery_id,
                            bool has_active_watcher);
 
   // Handles the setup gallery watch request response. When an extension is
   // loaded, GalleryWatchStateTracker reads the storage and sends request to
   // setup gallery watchers for the known watch paths.
@@ skipping 18 matching lines @@
 
   // A map of watched gallery details, per extension.
   WatchedExtensionsMap watched_extensions_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GalleryWatchStateTracker);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_GALLERY_WATCH_STATE_TRACKER_H_