Use MediaGalleryPreferences directly in GalleryWatchStateTracker interface.

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.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.
 
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h"
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/media_galleries_handler.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 
 namespace extensions {
 
 namespace AddGalleryWatch =
     extensions::api::media_galleries_private::AddGalleryWatch;
@@ skipping 62 matching lines @@
 }
 
 }  // namespace
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //                      MediaGalleriesPrivateAPI                             //
 ///////////////////////////////////////////////////////////////////////////////
 
 MediaGalleriesPrivateAPI::MediaGalleriesPrivateAPI(Profile* profile)
-    : profile_(profile),
-      tracker_(profile) {
+    : profile_(profile) {
   DCHECK(profile_);
   (new MediaGalleriesHandlerParser)->Register();
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnAttachEventName);
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnDetachEventName);
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
       this, event_names::kOnGalleryChangedEventName);
 }
 
@@ skipping 151 matching lines @@
   MaybeInitializeEventRouter();
 }
 
 MediaGalleriesPrivateEventRouter* MediaGalleriesPrivateAPI::GetEventRouter() {
   MaybeInitializeEventRouter();
   return media_galleries_private_event_router_.get();
 }
 
 GalleryWatchStateTracker*
 MediaGalleriesPrivateAPI::GetGalleryWatchStateTracker() {
-  return &tracker_;
+  MaybeInitializeEventRouter();
+  return tracker_.get();
 }
 
 void MediaGalleriesPrivateAPI::MaybeInitializeEventRouter() {

[Finnur, 2013/05/24 09:27:41]

nit: Why not rename this function to include Tracker... or just drop EventRouter
from the name (MaybeInitialize)?

[Greg Billock, 2013/05/29 16:33:48]

Done.

   if (media_galleries_private_event_router_.get())
     return;
   media_galleries_private_event_router_.reset(
       new MediaGalleriesPrivateEventRouter(profile_));
+  tracker_.reset(
+      new GalleryWatchStateTracker(profile_));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //              MediaGalleriesPrivateAddGalleryWatchFunction                 //
 ///////////////////////////////////////////////////////////////////////////////
 MediaGalleriesPrivateAddGalleryWatchFunction::
 ~MediaGalleriesPrivateAddGalleryWatchFunction() {
 }
 
 bool MediaGalleriesPrivateAddGalleryWatchFunction::RunImpl() {
   DCHECK(profile_);
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
   scoped_ptr<AddGalleryWatch::Params> params(
       AddGalleryWatch::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
+
   base::FilePath gallery_file_path;
   chrome::MediaGalleryPrefId gallery_pref_id = 0;
   if (!GetGalleryFilePathAndId(params->gallery_id, profile_, GetExtension(),
                                &gallery_file_path, &gallery_pref_id)) {
     error_ = kInvalidGalleryIDError;
     return false;
   }
 
 #if defined(OS_WIN)
   MediaGalleriesPrivateEventRouter* router =
@@ skipping 114 matching lines @@
 MediaGalleriesPrivateRemoveAllGalleryWatchFunction::
 ~MediaGalleriesPrivateRemoveAllGalleryWatchFunction() {
 }
 
 bool MediaGalleriesPrivateRemoveAllGalleryWatchFunction::RunImpl() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 #if defined(OS_WIN)
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
+  chrome::MediaFileSystemRegistry* registry =
+      g_browser_process->media_file_system_registry();
+  chrome::MediaGalleriesPreferences* preferences =
+      registry->GetPreferences(profile_);
   GalleryWatchStateTracker* state_tracker =
       MediaGalleriesPrivateAPI::Get(profile_)->GetGalleryWatchStateTracker();
-  state_tracker->RemoveAllGalleryWatchersForExtension(extension_id());
+  state_tracker->RemoveAllGalleryWatchersForExtension(
+      extension_id(), preferences);
 #endif
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //              MediaGalleriesPrivateEjectDeviceFunction                     //
 ///////////////////////////////////////////////////////////////////////////////
 
 MediaGalleriesPrivateEjectDeviceFunction::
 ~MediaGalleriesPrivateEjectDeviceFunction() {
@@ skipping 90 matching lines @@
     }
   }
 
   SetResult(result_list);
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions