Add gallery permissions to Media Galleries Preferences

chrome/browser/media_gallery/media_file_system_registry.cc

Index: chrome/browser/media_gallery/media_file_system_registry.cc
diff --git a/chrome/browser/media_gallery/media_file_system_registry.cc b/chrome/browser/media_gallery/media_file_system_registry.cc
index d1b8e21edd93b78fa8209d9ab1b23bfd183bb9bd..1a8f62fc9e3126c058b3385541d76acc75c4df8f 100644
--- a/chrome/browser/media_gallery/media_file_system_registry.cc
+++ b/chrome/browser/media_gallery/media_file_system_registry.cc
@@ -148,16 +148,29 @@ void MediaFileSystemRegistry::Observe(
   UnregisterForRPHGoneNotifications(rph);
 }
 
+std::string MediaFileSystemRegistry::GetDeviceIdFromPath(
+    const FilePath& path) const {
+  // TODO(vandebo) Do something better here, at least iterate system monitor
+  // attached media devices looking for a match.  If not, return the path.
+  return path.AsUTF8Unsafe();
+}
+
 /******************
  * Private methods
  ******************/
 
 MediaFileSystemRegistry::MediaFileSystemRegistry() {
-  SystemMonitor::Get()->AddDevicesChangedObserver(this);
+  // SystemMonitor may be NULL in unit tests.
+  SystemMonitor* system_monitor = SystemMonitor::Get();
+  if (system_monitor)
+    system_monitor->AddDevicesChangedObserver(this);
 }
 
 MediaFileSystemRegistry::~MediaFileSystemRegistry() {
-  SystemMonitor::Get()->RemoveDevicesChangedObserver(this);
+  // SystemMonitor may be NULL in unit tests.
+  SystemMonitor* system_monitor = SystemMonitor::Get();
+  if (system_monitor)
+    system_monitor->RemoveDevicesChangedObserver(this);
 }
 
 void MediaFileSystemRegistry::RegisterForRPHGoneNotifications(