Consolidate storage_monitor/MediaDeviceNotificationsUtils into MediaStorageUtil.

chrome/browser/media_galleries/media_galleries_dialog_controller.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/media_galleries/media_galleries_dialog_controller.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/profiles/profile.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/storage_info.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 51 matching lines @@
     monitor->RemoveObserver(this);
 
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
 string16 ConstructGalleryNameFromMetadata(
     const string16& vendor_name,
     const string16& model_name,
     uint64 size_in_bytes) {
-  return chrome::GetDisplayNameForDevice(
+  return MediaStorageUtil::GetDisplayNameForDevice(
       size_in_bytes,
-      chrome::GetFullProductName(UTF16ToUTF8(vendor_name),
-                                 UTF16ToUTF8(model_name)));
+      MediaStorageUtil::GetFullProductName(UTF16ToUTF8(vendor_name),
+                                           UTF16ToUTF8(model_name)));
 
 }
 
 // static
 string16 MediaGalleriesDialogController::GetGalleryDisplayName(
     const MediaGalleryPrefInfo& gallery) {
   string16 name = gallery.display_name;
   if (IsAttachedDevice(gallery.device_id)) {
     name += ASCIIToUTF16(" ");
     name +=
@@ skipping 308 matching lines @@
     if (iter->pref_info.device_id == device_id)
       dialog_->UpdateGallery(&iter->pref_info, iter->allowed);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome