[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/media_galleries/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 450 matching lines @@
     Profile* profile) {
   MediaGalleriesPreferences* preferences =
       MediaGalleriesPreferencesFactory::GetForProfile(profile);
   if (ContainsKey(extension_hosts_map_, profile))
     return preferences;
 
   // Create an empty entry so the initialization code below only gets called
   // once per profile.
   extension_hosts_map_[profile] = ExtensionHostMap();
 
-  // TODO(gbillock): Move this stanza to MediaGalleriesPreferences init code.

[vandebo (ex-Chrome), 2013/05/31 18:05:03]

I think we still want to do this, leave in todo?

[Greg Billock, 2013/06/01 01:48:46]

Yeah, I think this was impossible with the getting preferences async, but may
still be doable now.

   // StorageMonitor may be NULL in unit tests.
+  // TODO(gbillock): Make sure all tests have a storage monitor and remove this.
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   if (!monitor)
     return preferences;
+  DCHECK(monitor->IsInitialized());
   std::vector<StorageInfo> existing_devices = monitor->GetAttachedStorage();
   for (size_t i = 0; i < existing_devices.size(); i++) {
     if (!StorageInfo::IsMediaDevice(existing_devices[i].device_id()))
       continue;
     if (!existing_devices[i].name().empty()) {
       preferences->AddGalleryWithName(existing_devices[i].device_id(),
                                       existing_devices[i].name(),
                                       base::FilePath(),
                                       false /*not user added*/);
     } else {
@@ skipping 244 matching lines @@
     // previously used.
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome