Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/media_storage_util.h

Index: chrome/browser/storage_monitor/media_storage_util.h
diff --git a/chrome/browser/storage_monitor/media_storage_util.h b/chrome/browser/storage_monitor/media_storage_util.h
index c8c37540741ab7dd9a89c721011f749e83eea5ee..4d09d6a07c8145c51c66134e5de645ab6fe050b7 100644
--- a/chrome/browser/storage_monitor/media_storage_util.h
+++ b/chrome/browser/storage_monitor/media_storage_util.h
@@ -36,6 +36,24 @@ class MediaStorageUtil {
   typedef std::set<std::string /*device id*/> DeviceIdSet;
   typedef base::Callback<void(bool)> BoolCallback;
 
+
+  // Check if the file system at the passed mount point looks like a media
+  // device using the existence of DCIM directory.
+  // Returns true if it looks like a media device, otherwise returns false.
+  // Mac OS X behaves similarly, but this is not the only heuristic it uses.
+  // TODO(vandebo) Try to figure out how Mac OS X decides this, and rename
+  // if additional OS X heuristic is implemented.
+  static bool HasDcim(const base::FilePath::StringType& mount_point);
+
+  // Constructs the device product name from |vendor_name| and |model_name|.
+  static string16 GetFullProductName(const std::string& vendor_name,
+                                     const std::string& model_name);
+
+  // Constructs the display name for device from |storage_size_in_bytes| and
+  // |name|.
+  static string16 GetDisplayNameForDevice(uint64 storage_size_in_bytes,
+                                          const string16& name);
+
   // Returns a device id given properties of the device. A prefix dependent on
   // |type| is added so |unique_id| need only be unique within the given type.
   // Returns an empty string if an invalid type is passed in.