Cleanup: Remove chrome namespace for storage monitor and media galleries.

chrome/browser/storage_monitor/storage_monitor_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::StorageMonitorCros implementation.
 
 #include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 // Constructs a device id using uuid or manufacturer (vendor and product) id
 // details.
 std::string MakeDeviceUniqueId(const disks::DiskMountManager::Disk& disk) {
   std::string uuid = disk.fs_uuid();
   if (!uuid.empty())
-    return chrome::kFSUniqueIdPrefix + uuid;
+    return kFSUniqueIdPrefix + uuid;
 
   // If one of the vendor or product information is missing, its value in the
   // string is empty.
   // 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 + ":";
+  return kVendorModelSerialPrefix + vendor + ":" + product + ":";
 }
 
 // Returns true if the requested device is valid, else false. On success, fills
 // in |info|.
 bool GetDeviceInfo(const disks::DiskMountManager::MountPointInfo& mount_info,
                    bool has_dcim,
-                   chrome::StorageInfo* info) {
+                   StorageInfo* info) {
   DCHECK(info);
   std::string source_path = mount_info.source_path;
 
   const disks::DiskMountManager::Disk* disk =
       disks::DiskMountManager::GetInstance()->FindDiskBySourcePath(source_path);
   if (!disk || disk->device_type() == DEVICE_TYPE_UNKNOWN)
     return false;
 
   std::string unique_id = MakeDeviceUniqueId(*disk);
   // Keep track of device uuid and label, to see how often we receive empty
   // values.
   string16 device_label = UTF8ToUTF16(disk->device_label());
-  chrome::MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id,
-                                                      device_label);
+  MediaStorageUtil::RecordDeviceInfoHistogram(true, unique_id, device_label);
   if (unique_id.empty())
     return false;
 
-  chrome::StorageInfo::Type type = has_dcim ?
-      chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM :
-      chrome::StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
+  StorageInfo::Type type = has_dcim ?
+      StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM :
+      StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
 
-  *info = chrome::StorageInfo(
-      chrome::StorageInfo::MakeDeviceId(type, unique_id),
+  *info = StorageInfo(
+      StorageInfo::MakeDeviceId(type, unique_id),

[vandebo (ex-Chrome), 2013/09/12 20:37:23]

nit: this could go up to the previous line, with indent after the (

[Lei Zhang, 2013/09/12 20:40:06]

Done.

       string16(),
       mount_info.mount_path,
       device_label,
       UTF8ToUTF16(disk->vendor_name()),
       UTF8ToUTF16(disk->product_name()),
       disk->total_size_in_bytes());
   return true;
 }
 
 // Returns whether the mount point in |mount_info| is a media device or not.
 bool CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-  return chrome::MediaStorageUtil::HasDcim(
-      base::FilePath(mount_info.mount_path));
+  return MediaStorageUtil::HasDcim(base::FilePath(mount_info.mount_path));
 }
 
 }  // namespace
 
 using content::BrowserThread;
-using chrome::StorageInfo;
 
 StorageMonitorCros::StorageMonitorCros()
     : weak_ptr_factory_(this) {
 }
 
 StorageMonitorCros::~StorageMonitorCros() {
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
 }
 
 void StorageMonitorCros::Init() {
   DCHECK(disks::DiskMountManager::GetInstance());
   disks::DiskMountManager::GetInstance()->AddObserver(this);
   CheckExistingMountPoints();
 
   if (!media_transfer_protocol_manager_) {
     scoped_refptr<base::MessageLoopProxy> loop_proxy;
     media_transfer_protocol_manager_.reset(
         device::MediaTransferProtocolManager::Initialize(loop_proxy));
   }
 
   media_transfer_protocol_device_observer_.reset(
-      new chrome::MediaTransferProtocolDeviceObserverLinux(
+      new MediaTransferProtocolDeviceObserverLinux(
           receiver(), media_transfer_protocol_manager_.get()));
 }
 
 void StorageMonitorCros::CheckExistingMountPoints() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const disks::DiskMountManager::MountPointMap& mount_point_map =
       disks::DiskMountManager::GetInstance()->mount_points();
   for (disks::DiskMountManager::MountPointMap::const_iterator it =
            mount_point_map.begin(); it != mount_point_map.end(); ++it) {
     BrowserThread::PostTaskAndReplyWithResult(
@@ skipping 100 matching lines @@
   if (info_it == mount_map_.end())
     return false;
 
   *device_info = info_it->second;
   return true;
 }
 
 // Callback executed when the unmount call is run by DiskMountManager.
 // Forwards result to |EjectDevice| caller.
 void NotifyUnmountResult(
-    base::Callback<void(chrome::StorageMonitor::EjectStatus)> callback,
+    base::Callback<void(StorageMonitor::EjectStatus)> callback,
     chromeos::MountError error_code) {
   if (error_code == MOUNT_ERROR_NONE)
-    callback.Run(chrome::StorageMonitor::EJECT_OK);
+    callback.Run(StorageMonitor::EJECT_OK);
   else
-    callback.Run(chrome::StorageMonitor::EJECT_FAILURE);
+    callback.Run(StorageMonitor::EJECT_FAILURE);
 }
 
 void StorageMonitorCros::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   StorageInfo::Type type;
   if (!StorageInfo::CrackDeviceId(device_id, &type, NULL)) {
     callback.Run(EJECT_FAILURE);
     return;
   }
@@ skipping 35 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ContainsKey(mount_map_, mount_info.mount_path)) {
     // CheckExistingMountPointsOnUIThread() added the mount point information
     // in the map before the device attached handler is called. Therefore, an
     // entry for the device already exists in the map.
     return;
   }
 
   // Get the media device uuid and label if exists.
-  chrome::StorageInfo info;
+  StorageInfo info;
   if (!GetDeviceInfo(mount_info, has_dcim, &info))
     return;
 
   if (info.device_id().empty())
     return;
 
   mount_map_.insert(std::make_pair(mount_info.mount_path, info));
 
   receiver()->ProcessAttach(info);
 }
 
 }  // namespace chromeos
 
-namespace chrome {
-
 StorageMonitor* StorageMonitor::Create() {
   return new chromeos::StorageMonitorCros();
 }
-
-}  // namespace chrome