Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/storage_monitor/disk_info_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/disk_info_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/sys_string_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"
 
 namespace chrome {
 namespace {
 
 string16 GetUTF16FromDictionary(CFDictionaryRef dictionary, CFStringRef key) {
   CFStringRef value =
       base::mac::GetValueFromDictionary<CFStringRef>(dictionary, key);
   if (!value)
@@ skipping 50 matching lines @@
   string16 vendor_name = GetUTF16FromDictionary(
       dict, kDADiskDescriptionDeviceVendorKey);
   string16 model_name = GetUTF16FromDictionary(
       dict, kDADiskDescriptionDeviceModelKey);
   string16 volume_name = GetUTF16FromDictionary(
       dict, kDADiskDescriptionVolumeNameKey);
 
   if (!volume_name.empty()) {
     info.device_name_ = volume_name;
   } else {
-    info.device_name_ = GetFullProductName(UTF16ToUTF8(vendor_name),
-                                           UTF16ToUTF8(model_name));
+    info.device_name_ = MediaStorageUtil::GetFullProductName(
+        UTF16ToUTF8(vendor_name),
+        UTF16ToUTF8(model_name));
   }
   info.model_name_ = UTF16ToUTF8(model_name);
 
   CFUUIDRef uuid = base::mac::GetValueFromDictionary<CFUUIDRef>(
       dict, kDADiskDescriptionVolumeUUIDKey);
   std::string unique_id;
   if (uuid) {
     base::mac::ScopedCFTypeRef<CFStringRef> uuid_string(
         CFUUIDCreateString(NULL, uuid));
     if (uuid_string.get())
       unique_id = base::SysCFStringRefToUTF8(uuid_string);
   }
   if (unique_id.empty()) {
     string16 revision = GetUTF16FromDictionary(
         dict, kDADiskDescriptionDeviceRevisionKey);
     string16 unique_id2 = vendor_name;
     unique_id2 = JoinName(unique_id2, model_name);
     unique_id2 = JoinName(unique_id2, revision);
     unique_id = UTF16ToUTF8(unique_id2);
   }
 
   CFBooleanRef is_removable_ref =
       base::mac::GetValueFromDictionary<CFBooleanRef>(
           dict, kDADiskDescriptionMediaRemovableKey);
   bool is_removable = is_removable_ref && CFBooleanGetValue(is_removable_ref);
   // Checking for DCIM only matters on removable devices.
-  bool has_dcim = is_removable && IsMediaDevice(info.mount_point_.value());
+  bool has_dcim =
+      is_removable && MediaStorageUtil::HasDcim(info.mount_point_.value());
   info.type_ = GetDeviceType(is_removable, has_dcim);
   if (!unique_id.empty())
     info.device_id_ = MediaStorageUtil::MakeDeviceId(info.type_, unique_id);
 
   return info;
 }
 
 }  // namesapce chrome