Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/media_storage_util.h

 // 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 provides information about storage devices attached
 // to the computer.
 
 #ifndef CHROME_BROWSER_STORAGE_MONITOR_MEDIA_STORAGE_UTIL_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_MEDIA_STORAGE_UTIL_H_
 
@@ skipping 18 matching lines @@
     FIXED_MASS_STORAGE,
     // A MTP or PTP device.
     MTP_OR_PTP,
     // A Mac ImageCapture device.
     MAC_IMAGE_CAPTURE,
   };
 
   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.
   static std::string MakeDeviceId(Type type, const std::string& unique_id);
 
   // Extracts the device |type| and |unique_id| from |device_id|. Returns false
   // if the device_id isn't properly formatted.
   static bool CrackDeviceId(const std::string& device_id,
                             Type* type, std::string* unique_id);
 
@@ skipping 39 matching lines @@
                                         const std::string& device_uuid,
                                         const string16& device_name);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(MediaStorageUtil);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_MEDIA_STORAGE_UTIL_H_