Index: chrome/browser/storage_monitor/storage_monitor.cc |
=================================================================== |
--- chrome/browser/storage_monitor/storage_monitor.cc (revision 218837) |
+++ chrome/browser/storage_monitor/storage_monitor.cc (working copy) |
@@ -45,10 +45,7 @@ |
} |
StorageMonitor* StorageMonitor::GetInstance() { |
- if (g_browser_process) |
- return g_browser_process->storage_monitor(); |
- |
- return NULL; |
+ return g_browser_process ? g_browser_process->storage_monitor() : NULL; |
} |
std::vector<StorageInfo> StorageMonitor::GetAllAvailableStorages() const { |
@@ -149,8 +146,7 @@ |
storage_map_.insert(std::make_pair(info.device_id(), info)); |
} |
- DVLOG(1) << "StorageAttached with name " << UTF16ToUTF8(info.name()) |
- << " and id " << info.device_id(); |
+ DVLOG(1) << "StorageAttached with id " << info.device_id(); |
if (StorageInfo::IsRemovableDevice(info.device_id())) { |
observer_list_->Notify( |
&RemovableStorageObserver::OnRemovableStorageAttached, info); |