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/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/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/udev_util_linux.h"
 
 namespace chrome {
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 106 matching lines @@
   std::string device_label = GetUdevDevicePropertyValue(device, kLabel);
   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(
+  const string16 name = MediaStorageUtil::GetFullProductName(
       GetUdevDevicePropertyValue(device, kVendor),
       GetUdevDevicePropertyValue(device, kModel));
 
   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;
 }
@@ skipping 261 matching lines @@
   bool removable;
   uint64 partition_size_in_bytes;
   get_device_info_func_(mount_device, &unique_id, &name, &removable,
                         &partition_size_in_bytes);
 
   // Keep track of device info details to see how often we get invalid values.
   MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, name);
   if (unique_id.empty() || name.empty())
     return;
 
-  bool has_dcim = IsMediaDevice(mount_point.value());
+  bool has_dcim = MediaStorageUtil::HasDcim(mount_point.value());
   MediaStorageUtil::Type type;
   if (removable) {
     if (has_dcim) {
       type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM;
     } else {
       type = MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
     }
   } else {
     type = MediaStorageUtil::FIXED_MASS_STORAGE;
   }
   std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
 
   MountPointInfo mount_point_info;
   mount_point_info.mount_device = mount_device;
   mount_point_info.device_id = device_id;
   mount_point_info.device_name = name;
   mount_point_info.partition_size_in_bytes = 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);
+
+    StorageInfo storage_info(device_id, display_name, mount_point.value());

[Greg Billock, 2013/03/06 21:48:27]

I'd get rid of this temporary here and elsewhere. (The one for display_name
seems fine to me.)

+    receiver()->ProcessAttach(storage_info);
   }
 }
 
 }  // namespace chrome