Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/storage_monitor_mac.mm

 // 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/storage_monitor_mac.h"
 
 #include "base/mac/mac_util.h"
 #include "chrome/browser/storage_monitor/image_capture_device_manager.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"
 
 namespace chrome {
 
 namespace {
 
 const char kDiskImageModelName[] = "Disk Image";
 
 // TODO(gbillock): Make these take weak pointers and don't have
 // RemovableDeviceNotificationsMac be ref counted.
@@ skipping 126 matching lines @@
   }
 
   if (update_type == UPDATE_DEVICE_REMOVED) {
     if (it != disk_info_map_.end())
       disk_info_map_.erase(it);
   } else {
     disk_info_map_[info.bsd_name()] = info;
     MediaStorageUtil::RecordDeviceInfoHistogram(true, info.device_id(),
                                                 info.device_name());
     if (ShouldPostNotificationForDisk(info)) {
-      string16 display_name = GetDisplayNameForDevice(
+      string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(
           info.total_size_in_bytes(), info.device_name());
       receiver()->ProcessAttach(StorageInfo(
           info.device_id(), display_name, info.mount_point().value()));
     }
   }
 }
 
 bool StorageMonitorMac::GetStorageInfoForPath(const base::FilePath& path,
                                               StorageInfo* device_info) const {
   if (!path.IsAbsolute())
@@ skipping 103 matching lines @@
       it = disk_info_map_.begin(); it != disk_info_map_.end(); ++it) {
     if (it->second.mount_point() == mount_point) {
       *info = it->second;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace chrome