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

chrome/browser/system_monitor/media_storage_util.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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
@@ skipping 69 matching lines @@
 
     if (type == MediaStorageUtil::FIXED_MASS_STORAGE) {
       if (!file_util::PathExists(FilePath::FromUTF8Unsafe(unique_id)))
         missing_devices.insert(*it);
       continue;
     }
 
     DCHECK(type == MediaStorageUtil::MTP_OR_PTP ||
            type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM ||
            type == MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM);
-    if (!FindRemovableStorageLocationById(*it).empty())
+    if (FindRemovableStorageLocationById(*it).empty())
       missing_devices.insert(*it);
   }
 
   for (MediaStorageUtil::DeviceIdSet::const_iterator it =
            missing_devices.begin();
        it != missing_devices.end();
        ++it) {
     devices->erase(*it);
   }
 }
@@ skipping 113 matching lines @@
     return false;
 
   if (g_test_get_device_info_from_path_function) {
     return g_test_get_device_info_from_path_function(path, device_id,
                                                      device_name,
                                                      relative_path);
   }
 
   bool found_device = false;
   base::SystemMonitor::RemovableStorageInfo device_info;
-#if (defined(OS_LINUX) || defined(OS_MACOSX)) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_MACOSX))
   RemovableDeviceNotifications* notifier =
       RemovableDeviceNotifications::GetInstance();
   found_device = notifier->GetDeviceInfoForPath(path, &device_info);
 #endif
 
-#if 0 && defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
   if (!found_device) {
-    MediaTransferProtocolDeviceObserver* mtp_manager =
-        MediaTransferProtocolDeviceObserver::GetInstance();
+    chromeos::mtp::MediaTransferProtocolDeviceObserverCros* mtp_manager =
+        chromeos::mtp::MediaTransferProtocolDeviceObserverCros::GetInstance();
     found_device = mtp_manager->GetStorageInfoForPath(path, &device_info);
   }
 #endif
 
   if (found_device && IsRemovableDevice(device_info.device_id)) {
     if (device_id)
       *device_id = device_info.device_id;
     if (device_name)
       *device_name = device_info.name;
     if (relative_path) {
@@ skipping 33 matching lines @@
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
 }  // namespace chrome