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

chrome/browser/system_monitor/removable_device_notifications_chromeos.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.
 
 // chromeos::RemovableDeviceNotificationsCros implementation.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
-using base::SystemMonitor;
-
 namespace {
 
 // Constructs a device name using label or manufacturer (vendor and product)
 // name details.
 string16 GetDeviceName(const disks::DiskMountManager::Disk& disk) {
   if (disk.device_type() == DEVICE_TYPE_SD) {
     // Mount path of an SD card will be one of the following:
     // (1) /media/removable/<volume_label>
     // (2) /media/removable/SD Card
     // If the volume label is available, mount path will be (1) else (2).
@@ skipping 21 matching lines @@
   // Format: VendorModelSerial:VendorInfo:ModelInfo:SerialInfo
   // TODO(kmadhusu) Extract serial information for the disks and append it to
   // the device unique id.
   const std::string& vendor = disk.vendor_id();
   const std::string& product = disk.product_id();
   if (vendor.empty() && product.empty())
     return std::string();
   return chrome::kVendorModelSerialPrefix + vendor + ":" + product + ":";
 }
 
-static RemovableDeviceNotificationsCros*
-    g_removable_device_notifications_chromeos = NULL;
-
 // Returns true if the requested device is valid, else false. On success, fills
 // in |unique_id|, |device_label| and |storage_size_in_bytes|.
 bool GetDeviceInfo(const std::string& source_path,
                    std::string* unique_id,
                    string16* device_label,
                    uint64* storage_size_in_bytes) {
   const disks::DiskMountManager::Disk* disk =
       disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path);
   if (!disk || disk->device_type() == DEVICE_TYPE_UNKNOWN)
     return false;
 
   if (unique_id)
     *unique_id = MakeDeviceUniqueId(*disk);
 
   if (device_label)
     *device_label = GetDeviceName(*disk);
 
   if (storage_size_in_bytes)
     *storage_size_in_bytes = disk->total_size_in_bytes();
   return true;
 }
 
 }  // namespace
 
 using content::BrowserThread;
 
 RemovableDeviceNotificationsCros::RemovableDeviceNotificationsCros() {
   DCHECK(disks::DiskMountManager::GetInstance());
-  DCHECK(!g_removable_device_notifications_chromeos);
-  g_removable_device_notifications_chromeos = this;
   disks::DiskMountManager::GetInstance()->AddObserver(this);
   CheckExistingMountPointsOnUIThread();
 }
 
 RemovableDeviceNotificationsCros::~RemovableDeviceNotificationsCros() {
-  DCHECK_EQ(this, g_removable_device_notifications_chromeos);
-  g_removable_device_notifications_chromeos = NULL;
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
 }
 
 void RemovableDeviceNotificationsCros::CheckExistingMountPointsOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const disks::DiskMountManager::MountPointMap& mount_point_map =
       disks::DiskMountManager::GetInstance()->mount_points();
@@ skipping 43 matching lines @@
           BrowserThread::FILE, FROM_HERE,
           base::Bind(
               &RemovableDeviceNotificationsCros::CheckMountedPathOnFileThread,
               this, mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
-      SystemMonitor::Get()->ProcessRemovableStorageDetached(
-          it->second.storage_info.device_id);
+      ProcessDetach(it->second.storage_info.device_id);
       mount_map_.erase(it);
       break;
     }
   }
 }
 
 void RemovableDeviceNotificationsCros::OnFormatEvent(
     disks::DiskMountManager::FormatEvent event,
     FormatError error_code,
     const std::string& device_path) {
 }
 
 bool RemovableDeviceNotificationsCros::GetDeviceInfoForPath(
     const FilePath& path,
-    SystemMonitor::RemovableStorageInfo* device_info) const {
+    StorageInfo* device_info) const {
   if (!path.IsAbsolute())
     return false;
 
   FilePath current = path;
   while (!ContainsKey(mount_map_, current.value()) &&
          current != current.DirName()) {
     current = current.DirName();
   }
 
   MountMap::const_iterator info_it = mount_map_.find(current.value());
@@ skipping 50 matching lines @@
   if (unique_id.empty() || device_label.empty())
     return;
 
   chrome::MediaStorageUtil::Type type = has_dcim ?
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM :
       chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
   std::string device_id = chrome::MediaStorageUtil::MakeDeviceId(type,
                                                                  unique_id);
   StorageObjectInfo object_info = {
-      base::SystemMonitor::RemovableStorageInfo(device_id, device_label,
-                                                mount_info.mount_path),
+      StorageInfo(device_id, device_label, mount_info.mount_path),
       storage_size_in_bytes
   };
   mount_map_.insert(std::make_pair(mount_info.mount_path, object_info));
-  SystemMonitor::Get()->ProcessRemovableStorageAttached(
+  ProcessAttach(
       device_id,
       chrome::GetDisplayNameForDevice(storage_size_in_bytes, device_label),
       mount_info.mount_path);
 }
 
 }  // namespace chromeos
-
-namespace chrome {
-
-RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
-  return chromeos::g_removable_device_notifications_chromeos;
-}
-
-}  // namespace chrome