Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/volume_mount_watcher_win.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.
 
 #include "chrome/browser/storage_monitor/volume_mount_watcher_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 #include <fileapi.h>
 
 #include "base/stl_util.h"
 #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"
 
 using content::BrowserThread;
 
 namespace {
 
 const DWORD kMaxPathBufLen = MAX_PATH + 1;
 
 bool IsRemovable(const string16& mount_point) {
@@ skipping 221 matching lines @@
                                        &unique_id, &device_name, &removable,
                                        &total_size_in_bytes)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
         &chrome::VolumeMountWatcherWin::DeviceCheckComplete,
         volume_watcher, device_path));
     return;
   }
 
   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);
 
   chrome::VolumeMountWatcherWin::MountPointInfo info;
   info.device_id = device_id;
   info.location = device_location;
   info.unique_id = unique_id;
   info.name = device_name;
   info.removable = removable;
@@ skipping 98 matching lines @@
 
   device_metadata_[device_path.value()] = info;
 
   DeviceCheckComplete(device_path);
 
   // Don't call removable storage observers for fixed volumes.
   if (!info.removable)
     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);
   }
 }
 
 void VolumeMountWatcherWin::HandleDeviceDetachEventOnUIThread(
     const string16& device_location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MountPointDeviceMetadataMap::const_iterator device_info =
       device_metadata_.find(device_location);
   // If the device isn't type removable (like a CD), it won't be there.
   if (device_info == device_metadata_.end())
     return;
 
   if (notifications_)
     notifications_->ProcessDetach(device_info->second.device_id);
   device_metadata_.erase(device_info);
 }
 
 }  // namespace chrome