Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/storage_monitor_linux.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.
 
 // StorageMonitorLinux implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/histogram.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 "chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux.h"
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/udev_util_linux.h"
 #include "chrome/common/chrome_switches.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 
 namespace chrome {
 
 using content::BrowserThread;
@@ skipping 121 matching lines @@
 
   if (!device_label.empty() && IsStringUTF8(device_label))
     return UTF8ToUTF16(device_label);
 
   device_label = GetUdevDevicePropertyValue(device, kFsUUID);
   // Keep track of device uuid, to see how often we receive empty uuid values.
   UMA_HISTOGRAM_BOOLEAN(
       "RemovableDeviceNotificationsLinux.device_file_system_uuid_available",
       !device_label.empty());
 
-  const string16 name = GetFullProductName(vendor_name, model_name);
+  const string16 name = MediaStorageUtil::GetFullProductName(vendor_name,
+                                                             model_name);
 
   const string16 device_label_utf16 =
       (!device_label.empty() && IsStringUTF8(device_label)) ?
           UTF8ToUTF16(device_label) : string16();
   if (!name.empty() && !device_label_utf16.empty())
     return device_label_utf16 + ASCIIToUTF16(" ") + name;
   return name.empty() ? device_label_utf16 : name;
 }
 
 // Get the device information using udev library.
@@ skipping 61 matching lines @@
     value = udev_device_get_sysattr_value(parent_device, kRemovableSysAttr);
   }
   bool is_removable = (value && atoi(value) == 1);
   if (removable) {
     *removable = is_removable;
   }
 
   if (device_id) {
     MediaStorageUtil::Type type = MediaStorageUtil::FIXED_MASS_STORAGE;
     if (is_removable) {
-      if (IsMediaDevice(mount_point.value()))
+      if (MediaStorageUtil::HasDcim(mount_point.value()))
         type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM;
       else
         type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
     }
     *device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
   }
 
   if (partition_size_in_bytes)
     *partition_size_in_bytes = GetDeviceStorageSize(device_path, device);
   RecordGetDeviceInfoResult(true);
@@ skipping 216 matching lines @@
 
   MountPointInfo mount_point_info;
   mount_point_info.mount_device = mount_device;
   mount_point_info.storage_info = StorageInfo(
       device_id, name, mount_point.value(), volume_label,
       vendor_name, model_name, partition_size_in_bytes);
   mount_info_map_[mount_point] = mount_point_info;
   mount_priority_map_[mount_device][mount_point] = removable;
 
   if (removable) {
-    receiver()->ProcessAttach(StorageInfo(
-        device_id, GetDisplayNameForDevice(partition_size_in_bytes, name),
-        mount_point.value()));
+    string16 display_name = MediaStorageUtil::GetDisplayNameForDevice(
+        partition_size_in_bytes, name);
+
+    receiver()->ProcessAttach(StorageInfo(device_id, display_name,
+                                          mount_point.value()));
   }
 }
 
 }  // namespace chrome