Use MediaGalleryPreferences directly in GalleryWatchStateTracker interface.

chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc

 // 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 implementation.
 
 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 54 matching lines @@
 
 // Looks up an extension by ID. Does not include disabled extensions.
 const Extension* GetExtensionById(Profile* profile,
                                   const std::string& extension_id) {
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return NULL;
   return service->GetExtensionById(extension_id, false);
 }
 
-// Returns the initialized media galleries preferences for the specified
-// |profile|.
-chrome::MediaGalleriesPreferences* GetMediaGalleryPreferences(
-    Profile* profile) {
-  return g_browser_process->media_file_system_registry()->GetPreferences(
-      profile);
-}
-
 }  // namespace
 
 GalleryWatchStateTracker::GalleryWatchStateTracker(Profile* profile)
     : profile_(profile) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
@@ skipping 16 matching lines @@
   if (!private_api)
     return NULL;  // In unit tests, we don't have a MediaGalleriesPrivateAPI.
   return private_api->GetGalleryWatchStateTracker();
 #endif
   return NULL;
 }
 
 void GalleryWatchStateTracker::OnGalleryPermissionChanged(
     const std::string& extension_id,
     chrome::MediaGalleryPrefId gallery_id,
-    bool has_permission) {
+    bool has_permission,
+    chrome::MediaGalleriesPreferences* preferences) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   // Granted gallery permission.
   if (has_permission && HasGalleryWatchInfo(extension_id, gallery_id, false)) {
-    SetupGalleryWatch(extension_id, gallery_id);
+    SetupGalleryWatch(extension_id, gallery_id, preferences);
     return;
   }
 
   // Revoked gallery permission.
   if (!has_permission && HasGalleryWatchInfo(extension_id, gallery_id, true))
-    RemoveGalleryWatch(extension_id, gallery_id);
+    RemoveGalleryWatch(extension_id, gallery_id, preferences);
 }
 
 chrome::MediaGalleryPrefIdSet
 GalleryWatchStateTracker::GetAllWatchedGalleryIDsForExtension(
     const std::string& extension_id) const {
   chrome::MediaGalleryPrefIdSet gallery_ids;
   WatchedExtensionsMap::const_iterator extension_id_iter =
       watched_extensions_map_.find(extension_id);
   if (extension_id_iter != watched_extensions_map_.end()) {
     for (WatchedGalleriesMap::const_iterator gallery_id_iter =
              extension_id_iter->second.begin();
          gallery_id_iter != extension_id_iter->second.end();
          ++gallery_id_iter) {
       gallery_ids.insert(gallery_id_iter->first);
     }
   }
   return gallery_ids;
 }
 
 void GalleryWatchStateTracker::RemoveAllGalleryWatchersForExtension(
-    const std::string& extension_id) {
+    const std::string& extension_id,
+    chrome::MediaGalleriesPreferences* preferences) {
   WatchedExtensionsMap::iterator extension_id_iter =
       watched_extensions_map_.find(extension_id);
   if (extension_id_iter == watched_extensions_map_.end())
     return;
   const WatchedGalleriesMap& galleries = extension_id_iter->second;
   for (WatchedGalleriesMap::const_iterator gallery_id_iter = galleries.begin();
        gallery_id_iter != galleries.end(); ++gallery_id_iter)
-    RemoveGalleryWatch(extension_id, gallery_id_iter->second);
+    RemoveGalleryWatch(extension_id, gallery_id_iter->second, preferences);
   watched_extensions_map_.erase(extension_id_iter);
   WriteToStorage(extension_id);
 }
 
 void GalleryWatchStateTracker::OnGalleryWatchAdded(
     const std::string& extension_id,
     chrome::MediaGalleryPrefId gallery_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   bool update_storage =
       AddWatchedGalleryIdInfoForExtension(extension_id, gallery_id);
@@ skipping 63 matching lines @@
   if (!storage)
     return;
   chrome::MediaGalleryPrefIdSet gallery_ids =
       GetAllWatchedGalleryIDsForExtension(extension_id);
   storage->SetExtensionValue(
       extension_id,
       kRegisteredGalleryWatchers,
       WatchedGalleryIdsToValue(gallery_ids).PassAs<base::Value>());
 }
 
-void GalleryWatchStateTracker::ReadFromStorage(const std::string& extension_id,
-                                               scoped_ptr<base::Value> value) {
+void GalleryWatchStateTracker::ReadFromStorage(
+    const std::string& extension_id,
+    scoped_ptr<base::Value> value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  chrome::MediaGalleriesPreferences* preferences =
+      g_browser_process->media_file_system_registry()->GetPreferences(profile_);
   base::ListValue* list = NULL;
   if (!value.get() || !value->GetAsList(&list))
     return;
   chrome::MediaGalleryPrefIdSet gallery_ids = WatchedGalleryIdsFromValue(list);
+  if (gallery_ids.empty())
+    return;
+
   for (chrome::MediaGalleryPrefIdSet::const_iterator id_iter =
            gallery_ids.begin();
        id_iter != gallery_ids.end(); ++id_iter) {
     watched_extensions_map_[extension_id][*id_iter] = false;
-    SetupGalleryWatch(extension_id, *id_iter);
+    SetupGalleryWatch(extension_id, *id_iter, preferences);
   }
 }
 
 void GalleryWatchStateTracker::SetupGalleryWatch(
     const std::string& extension_id,
-    chrome::MediaGalleryPrefId gallery_id) {
+    chrome::MediaGalleryPrefId gallery_id,
+    chrome::MediaGalleriesPreferences* preferences) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   const Extension* extension = GetExtensionById(profile_, extension_id);
   DCHECK(extension);
-  base::FilePath gallery_file_path(
-      GetMediaGalleryPreferences(profile_)->LookUpGalleryPathForExtension(
-          gallery_id, extension, false));
+  base::FilePath gallery_file_path(preferences->LookUpGalleryPathForExtension(
+      gallery_id, extension, false));
   if (gallery_file_path.empty())
     return;
   MediaGalleriesPrivateEventRouter* router =
       MediaGalleriesPrivateAPI::Get(profile_)->GetEventRouter();
   DCHECK(router);
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&GalleryWatchManager::SetupGalleryWatch,
                  profile_,
                  gallery_id,
                  gallery_file_path,
                  extension_id,
                  router->AsWeakPtr()),
       base::Bind(&GalleryWatchStateTracker::HandleSetupGalleryWatchResponse,
                  AsWeakPtr(),
                  extension_id,
                  gallery_id));
 }
 
 void GalleryWatchStateTracker::RemoveGalleryWatch(
     const std::string& extension_id,
-    chrome::MediaGalleryPrefId gallery_id) {
+    chrome::MediaGalleryPrefId gallery_id,
+    chrome::MediaGalleriesPreferences* preferences) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   const Extension* extension = GetExtensionById(profile_, extension_id);
   DCHECK(extension);
-  base::FilePath gallery_file_path(
-      GetMediaGalleryPreferences(profile_)->LookUpGalleryPathForExtension(
-          gallery_id, extension, true));
+  base::FilePath gallery_file_path(preferences->LookUpGalleryPathForExtension(
+      gallery_id, extension, true));
   if (gallery_file_path.empty())
     return;
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&GalleryWatchManager::RemoveGalleryWatch,
                  profile_,
                  gallery_file_path,
                  extension_id));
   watched_extensions_map_[extension_id][gallery_id] = false;
 }
@@ skipping 23 matching lines @@
     const std::string& extension_id,
     chrome::MediaGalleryPrefId gallery_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (HasGalleryWatchInfo(extension_id, gallery_id, true))
     return false;
   watched_extensions_map_[extension_id][gallery_id] = true;
   return true;
 }
 
 }  // namespace extensions