Media Galleries: Keep media gallery permission dialogs in sync with the gallery

chrome/browser/media_gallery/media_galleries_preferences.cc

Index: chrome/browser/media_gallery/media_galleries_preferences.cc
===================================================================
--- chrome/browser/media_gallery/media_galleries_preferences.cc	(revision 181443)
+++ chrome/browser/media_gallery/media_galleries_preferences.cc	(working copy)
@@ -198,13 +198,14 @@
     }
   }
   if (notify_observers)
-    NotifyChangeObservers();
+    NotifyChangeObservers("");
 }
 
-void MediaGalleriesPreferences::NotifyChangeObservers() {
+void MediaGalleriesPreferences::NotifyChangeObservers(
+    const std::string& extension_id) {
   FOR_EACH_OBSERVER(GalleryChangeObserver,
                     gallery_change_observers_,
-                    OnGalleryChanged(this));
+                    OnGalleryChanged(this, extension_id));
 }
 
 void MediaGalleriesPreferences::AddGalleryChangeObserver(
@@ -439,6 +440,7 @@
   if (has_permission && all_permission) {
     if (gallery_info->second.type == MediaGalleryPrefInfo::kAutoDetected) {
       GetExtensionPrefs()->UnsetMediaGalleryPermission(extension.id(), pref_id);
+      NotifyChangeObservers(extension.id());
 #if defined(ENABLE_EXTENSIONS)
       if (state_tracker) {
         state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,
@@ -455,6 +457,7 @@
     GetExtensionPrefs()->SetMediaGalleryPermission(extension.id(), pref_id,
                                                    has_permission);
   }
+  NotifyChangeObservers(extension.id());
 #if defined(ENABLE_EXTENSIONS)
   if (state_tracker) {
     state_tracker->OnGalleryPermissionChanged(extension.id(), pref_id,