[Media Gallery] Add existing attached devices to the prefs in time for media galleries dialog.

chrome/browser/ui/webui/options/media_galleries_handler.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/ui/webui/options/media_galleries_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
+#include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
-#include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
@@ skipping 44 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "forgetGallery",
       base::Bind(&MediaGalleriesHandler::HandleForgetGallery,
                  base::Unretained(this)));
 }
 
 void MediaGalleriesHandler::OnGalleriesChanged() {
   Profile* profile = Profile::FromWebUI(web_ui());
   chrome::MediaGalleriesPreferences* preferences =
-      MediaGalleriesPreferencesFactory::GetForProfile(profile);
+      chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(profile);
 
   ListValue list;
   const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
   for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
        iter != galleries.end(); ++iter) {
     const MediaGalleryPrefInfo& gallery = iter->second;
     if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
       continue;
 
     DictionaryValue* dict = new DictionaryValue();
@@ skipping 24 matching lines @@
 void MediaGalleriesHandler::HandleForgetGallery(const base::ListValue* args) {
   std::string string_id;
   uint64 id = 0;
   if (!args->GetString(0, &string_id) ||
       !base::StringToUint64(string_id, &id)) {
     NOTREACHED();
     return;
   }
 
   chrome::MediaGalleriesPreferences* prefs =
-      MediaGalleriesPreferencesFactory::GetForProfile(
+      chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(
           Profile::FromWebUI(web_ui()));
   prefs->ForgetGalleryById(id);
 }
 
 void MediaGalleriesHandler::FileSelected(
     const FilePath& path, int index, void* params) {
   chrome::MediaGalleriesPreferences* prefs =
-      MediaGalleriesPreferencesFactory::GetForProfile(
+      chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(
           Profile::FromWebUI(web_ui()));
   prefs->AddGalleryByPath(path);
 }
 
 void MediaGalleriesHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED &&
       *content::Details<std::string>(details).ptr() ==
           prefs::kMediaGalleriesRememberedGalleries) {
     OnGalleriesChanged();
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace options