Media Galleries: Only try to initialize removable media galleries once per profile.

chrome/browser/media_gallery/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_gallery/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 527 matching lines @@
                                       callback);
 }
 
 MediaGalleriesPreferences* MediaFileSystemRegistry::GetPreferences(
     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();
+
   // RemovableStorageNotifications may be NULL in unit tests.
   RemovableStorageNotifications* notifications =
       RemovableStorageNotifications::GetInstance();
   if (!notifications)
     return preferences;
   std::vector<RemovableStorageNotifications::StorageInfo>
       existing_devices = notifications->GetAttachedStorage();
   for (size_t i = 0; i < existing_devices.size(); i++) {
     if (!MediaStorageUtil::IsMediaDevice(existing_devices[i].device_id))
       continue;
@@ skipping 60 matching lines @@
       for (std::set<MediaGalleryPrefId>::const_iterator pref_id_it =
                invalid_galleries_info[i].pref_ids.begin();
            pref_id_it != invalid_galleries_info[i].pref_ids.end();
            ++pref_id_it) {
         (*extension_host_it)->RevokeGalleryByPrefId(*pref_id_it);
       }
     }
   }
 }
 
-size_t MediaFileSystemRegistry::GetExtensionHostCountForTests() const {
-  return extension_hosts_map_.size();
+size_t MediaFileSystemRegistry::GetExtensionGalleriesHostCountForTests() const {
+  size_t extension_galleries_host_count = 0;
+  for (ExtensionGalleriesHostMap::const_iterator it =
+           extension_hosts_map_.begin();
+       it != extension_hosts_map_.end();
+       ++it) {
+    extension_galleries_host_count += it->second.size();
+  }
+  return extension_galleries_host_count;
 }
 
 uint64 MediaFileSystemRegistry::GetTransientIdForDeviceId(
     const std::string& device_id) {
   return transient_device_ids_.GetTransientIdForDeviceId(device_id);
 }
 
 /******************
  * Private methods
  ******************/
@@ skipping 157 matching lines @@
     Profile* profile, const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ExtensionGalleriesHostMap::iterator extension_hosts =
       extension_hosts_map_.find(profile);
   DCHECK(extension_hosts != extension_hosts_map_.end());
   ExtensionHostMap::size_type erase_count =
       extension_hosts->second.erase(extension_id);
   DCHECK_EQ(1U, erase_count);
   if (extension_hosts->second.empty()) {
-    extension_hosts_map_.erase(extension_hosts);
-
+    // When a profile has no ExtensionGalleriesHosts left, remove the
+    // matching PrefChangeRegistrar since it is no longer needed. Leave the
+    // |extension_hosts| entry alone, since it indicates the profile has been
+    // 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