[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/system_monitor/media_storage_util.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.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_LINUX)  // Implies OS_CHROMEOS
 #include "chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h"
 #endif
 
-using base::SystemMonitor;
 using content::BrowserThread;
 
 const char kRootPath[] = "/";
 
 namespace chrome {
 
 namespace {
 
 // MediaDeviceNotification.DeviceInfo histogram values.
 enum DeviceInfoHistogramBuckets {
@@ skipping 20 matching lines @@
     FilePath* relative_path) = NULL;
 
 void ValidatePathOnFileThread(
     const FilePath& path, const MediaStorageUtil::BoolCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, file_util::PathExists(path)));
 }
 
 bool IsRemovableStorageAttached(const std::string& id) {
-  std::vector<SystemMonitor::RemovableStorageInfo> media_devices =
-      SystemMonitor::Get()->GetAttachedRemovableStorage();
-  for (std::vector<SystemMonitor::RemovableStorageInfo>::const_iterator it =
-           media_devices.begin();
-       it != media_devices.end();
+  std::vector<RemovableStorageNotifications::StorageInfo> devices =
+      RemovableStorageNotifications::GetInstance()->GetAttachedStorage();
+  for (std::vector<RemovableStorageNotifications::StorageInfo>::

[vandebo (ex-Chrome), 2013/01/24 19:19:10]

nit: add a typedef for the vector<StorageInfo> type?

[Greg Billock, 2013/01/24 20:46:03]

Yeah, I thought about this. I don't like typedefs, but this is a pretty heavy
name and used all over. :-/ Since there wasn't one before, I bit the bullet.

[vandebo (ex-Chrome), 2013/01/24 23:39:01]

I'm not the biggest fan of typedefs, but when it starts to affect formatting,
either the name has to change, or a typedef should be used...

[Greg Billock, 2013/01/25 20:01:21]

Done.

+       const_iterator it = devices.begin();
+       it != devices.end();
        ++it) {
     if (it->device_id == id)
       return true;
   }
   return false;
 }
 
 FilePath::StringType FindRemovableStorageLocationById(
     const std::string& device_id) {
-  std::vector<SystemMonitor::RemovableStorageInfo> media_devices =
-      SystemMonitor::Get()->GetAttachedRemovableStorage();
-  for (std::vector<SystemMonitor::RemovableStorageInfo>::const_iterator it =
-           media_devices.begin();
-       it != media_devices.end();
+  std::vector<RemovableStorageNotifications::StorageInfo> devices =
+      RemovableStorageNotifications::GetInstance()->GetAttachedStorage();
+  for (std::vector<RemovableStorageNotifications::StorageInfo>::
+           const_iterator it = devices.begin();
+       it != devices.end();
        ++it) {
     if (it->device_id == device_id)
       return it->location;
   }
   return FilePath::StringType();
 }
 
 void FilterAttachedDevicesOnFileThread(MediaStorageUtil::DeviceIdSet* devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   MediaStorageUtil::DeviceIdSet missing_devices;
@@ skipping 140 matching lines @@
   if (type == FIXED_MASS_STORAGE) {
     // For this type, the unique_id is the path.
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             base::Bind(&ValidatePathOnFileThread,
                                        FilePath::FromUTF8Unsafe(unique_id),
                                        callback));
   } else {
     DCHECK(type == MTP_OR_PTP ||
            type == REMOVABLE_MASS_STORAGE_WITH_DCIM ||
            type == REMOVABLE_MASS_STORAGE_NO_DCIM);
-    // We should be able to find removable storage in SystemMonitor.
+    // We should be able to find removable storage.
     callback.Run(IsRemovableStorageAttached(device_id));
   }
 }
 
 // static
 void MediaStorageUtil::FilterAttachedDevices(DeviceIdSet* devices,
                                              const base::Closure& done) {
   if (BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
     FilterAttachedDevicesOnFileThread(devices);
     done.Run();
@@ skipping 14 matching lines @@
   if (!path.IsAbsolute())
     return false;
 
   if (g_test_get_device_info_from_path_function) {
     return g_test_get_device_info_from_path_function(path, device_id,
                                                      device_name,
                                                      relative_path);
   }
 
   bool found_device = false;
-  base::SystemMonitor::RemovableStorageInfo device_info;
+  RemovableStorageNotifications::StorageInfo device_info;
 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
   RemovableStorageNotifications* notifier =
       RemovableStorageNotifications::GetInstance();
   found_device = notifier->GetDeviceInfoForPath(path, &device_info);
 #endif
 
 #if defined(OS_LINUX)
   if (!found_device) {
     MediaTransferProtocolDeviceObserverLinux* mtp_manager =
         MediaTransferProtocolDeviceObserverLinux::GetInstance();
@@ skipping 92 matching lines @@
                             DEVICE_INFO_BUCKET_BOUNDARY);
 }
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 }  // namespace chrome