[Chrome OS]Implement MediaStorageUtil::GetDeviceInfoForPath function to support media gallery permi…

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
+using base::SystemMonitor;
+
 namespace {
 
 // Construct a device name using label or manufacturer (vendor and product) name
 // details.
 string16 GetDeviceName(const disks::DiskMountManager::Disk& disk) {
   std::string device_name = disk.device_label();
   if (device_name.empty()) {
     device_name = disk.vendor_name();
     const std::string& product_name = disk.product_name();
     if (!product_name.empty()) {
@@ skipping 20 matching lines @@
   const std::string& vendor = disk.vendor_id();
   const std::string& product = disk.product_id();
   if (vendor.empty() && product.empty())
     return std::string();
   return base::StringPrintf("%s%s%s%s%s",
                             chrome::kVendorModelSerialPrefix,
                             vendor.c_str(), chrome::kNonSpaceDelim,
                             product.c_str(), chrome::kNonSpaceDelim);
 }
 
+static RemovableDeviceNotificationsCros*
+    g_removable_device_notifications_chromeos = NULL;
+
 // Returns true if the requested device is valid, else false. On success, fills
 // in |unique_id| and |device_label|
 bool GetDeviceInfo(const std::string& source_path, std::string* unique_id,
                    string16* device_label) {
   // Get the media device uuid and label if exists.
   const disks::DiskMountManager::Disk* disk =
       disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path);
   if (!disk || disk->device_type() == DEVICE_TYPE_UNKNOWN)
     return false;
 
   if (unique_id)
     *unique_id = MakeDeviceUniqueId(*disk);
 
   if (device_label)
     *device_label = GetDeviceName(*disk);
   return true;
 }
 
 }  // namespace
 
 using content::BrowserThread;
 
 RemovableDeviceNotificationsCros::RemovableDeviceNotificationsCros() {
   DCHECK(disks::DiskMountManager::GetInstance());
+  DCHECK(!g_removable_device_notifications_chromeos);
+  g_removable_device_notifications_chromeos = this;
   disks::DiskMountManager::GetInstance()->AddObserver(this);
   CheckExistingMountPointsOnUIThread();
 }
 
 RemovableDeviceNotificationsCros::~RemovableDeviceNotificationsCros() {
+  DCHECK_EQ(this, g_removable_device_notifications_chromeos);
+  g_removable_device_notifications_chromeos = NULL;
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
 }
 
+// static
+RemovableDeviceNotificationsCros*
+RemovableDeviceNotificationsCros::GetInstance() {
+  return g_removable_device_notifications_chromeos;
+}
+
 void RemovableDeviceNotificationsCros::CheckExistingMountPointsOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const disks::DiskMountManager::MountPointMap& mount_point_map =
       disks::DiskMountManager::GetInstance()->mount_points();
   for (disks::DiskMountManager::MountPointMap::const_iterator it =
            mount_point_map.begin(); it != mount_point_map.end(); ++it) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(
             &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
@@ skipping 37 matching lines @@
           BrowserThread::FILE, FROM_HERE,
           base::Bind(
               &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
               this, mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
-      base::SystemMonitor::Get()->ProcessRemovableStorageDetached(it->second);
+      SystemMonitor::Get()->ProcessRemovableStorageDetached(
+          it->second.device_id);
       mount_map_.erase(it);
       break;
     }
   }
 }
 
+bool RemovableDeviceNotificationsCros::GetDeviceInfoForPath(
+    const FilePath& path,
+    SystemMonitor::RemovableStorageInfo* device_info) const {
+  if (!path.IsAbsolute())
+    return false;
+
+  FilePath current = path;
+  while (!ContainsKey(mount_map_, current.value()) &&
+         current != current.DirName()) {
+    current = current.DirName();
+  }
+
+  MountMap::const_iterator info_it = mount_map_.find(current.value());
+  if (info_it == mount_map_.end())
+    return false;
+
+  if (device_info)
+    *device_info = info_it->second;
+  return true;
+}
+
 void RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   bool has_dcim = chrome::IsMediaDevice(mount_info.mount_path);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&RemovableDeviceNotificationsCros::AddMountedPathOnUIThread,
                  this, mount_info, has_dcim));
 }
 
 void RemovableDeviceNotificationsCros::AddMountedPathOnUIThread(
     const disks::DiskMountManager::MountPointInfo& mount_info, bool has_dcim) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (ContainsKey(mount_map_, mount_info.mount_path)) {
-    NOTREACHED();
+  if (ContainsKey(mount_map_, mount_info.mount_path))

[Lei Zhang, 2012/09/18 00:28:02]

You mentioned the condition under which this can happen. Can you put that info
as a comment here?

[kmadhusu, 2012/09/18 00:50:05]

Done.

     return;
-  }
 
   // Get the media device uuid and label if exists.
   std::string unique_id;
   string16 device_label;
   if (!GetDeviceInfo(mount_info.source_path, &unique_id, &device_label))
     return;
 
   // Keep track of device uuid, to see how often we receive empty uuid values.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceUUIDAvailable",
                         !unique_id.empty());
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.DeviceNameAvailable",
                         !device_label.empty());
   if (unique_id.empty() || device_label.empty())
     return;
 
   chrome::MediaStorageUtil::Type type = has_dcim ?
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
   std::string device_id = chrome::MediaStorageUtil::MakeDeviceId(type,
                                                                  unique_id);
-  mount_map_.insert(std::make_pair(mount_info.mount_path, device_id));
-  base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
+  SystemMonitor::RemovableStorageInfo info(device_id, device_label,
+                                           mount_info.mount_path);
+  mount_map_.insert(std::make_pair(mount_info.mount_path, info));
+  SystemMonitor::Get()->ProcessRemovableStorageAttached(
       device_id,
       device_label,
       mount_info.mount_path);
 }
 
 }  // namespace chrome