Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/volume_mount_watcher_win.cc

Index: chrome/browser/storage_monitor/volume_mount_watcher_win.cc
diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
index cc68938cbe052080d0e16b8552ded67712ad02db..7e867872321c6bffceff552c53acc148d0808262 100644
--- a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
+++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
@@ -12,7 +12,6 @@
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/storage_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/storage_monitor/media_storage_util.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -254,7 +253,7 @@ void VolumeMountWatcherWin::RetrieveInfoForDeviceAndAdd(
 
   chrome::MediaStorageUtil::Type type =
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
-  if (chrome::IsMediaDevice(device_path.value()))
+  if (MediaStorageUtil::HasDcim(device_path.value()))
     type = chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   std::string device_id =
       chrome::MediaStorageUtil::MakeDeviceId(type, unique_id);
@@ -373,10 +372,11 @@ void VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread(
     return;
 
   if (notifications_) {
-    string16 display_name =
-        GetDisplayNameForDevice(info.total_size_in_bytes, info.name);
-    notifications_->ProcessAttach(StorageInfo(info.device_id, display_name,
-                                              device_path.value()));
+    string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(
+        info.total_size_in_bytes, info.name);
+
+    StorageInfo storage_info(info.device_id, display_name, device_path.value());
+    notifications_->ProcessAttach(storage_info);
   }
 }