Add gallery permissions to Media Galleries Preferences

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>
 
@@ skipping 118 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const RenderProcessHost* rph =
       content::Source<content::RenderProcessHost>(source).ptr();
   ChildIdToMediaFSMap::iterator child_it = media_fs_map_.find(rph);
   CHECK(child_it != media_fs_map_.end());
   // No need to revoke the isolated file systems. The RPH will do that.
   media_fs_map_.erase(child_it);
   UnregisterForRPHGoneNotifications(rph);
 }
 
+std::string MediaFileSystemRegistry::GetDeviceIdFromPath(const FilePath& path) {
+  // 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.value();
+}
+
 /******************
  * 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(
     const content::RenderProcessHost* rph) {
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                  content::Source<RenderProcessHost>(rph));
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                  content::Source<RenderProcessHost>(rph));
 }
 
@@ skipping 33 matching lines @@
     MediaPathToFSIDMap& child_map = child_it->second;
     MediaPathToFSIDMap::iterator media_path_it = child_map.find(path);
     if (media_path_it == child_map.end())
       continue;
     isolated_context->RevokeFileSystem(media_path_it->second);
     child_map.erase(media_path_it);
   }
 }
 
 }  // namespace chrome