summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/storage_monitor/storage_monitor.cc4
-rw-r--r--chrome/browser/storage_monitor/transient_device_ids.cc1
-rw-r--r--chrome/browser/storage_monitor/transient_device_ids.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/storage_monitor/storage_monitor.cc b/chrome/browser/storage_monitor/storage_monitor.cc
index 6d27d3b..a771fd5 100644
--- a/chrome/browser/storage_monitor/storage_monitor.cc
+++ b/chrome/browser/storage_monitor/storage_monitor.cc
@@ -156,7 +156,7 @@ void StorageMonitor::ProcessAttach(const StorageInfo& info) {
storage_map_.insert(std::make_pair(info.device_id(), info));
}
- DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(info.name())
+ DVLOG(1) << "StorageAttached with name " << UTF16ToUTF8(info.name())
<< " and id " << info.device_id();
if (StorageInfo::IsRemovableDevice(info.device_id())) {
observer_list_->Notify(
@@ -175,7 +175,7 @@ void StorageMonitor::ProcessDetach(const std::string& id) {
storage_map_.erase(it);
}
- DVLOG(1) << "RemovableStorageDetached for id " << id;
+ DVLOG(1) << "StorageDetached for id " << id;
if (StorageInfo::IsRemovableDevice(info.device_id())) {
observer_list_->Notify(
&RemovableStorageObserver::OnRemovableStorageDetached, info);
diff --git a/chrome/browser/storage_monitor/transient_device_ids.cc b/chrome/browser/storage_monitor/transient_device_ids.cc
index cfdf8d6..850c17c 100644
--- a/chrome/browser/storage_monitor/transient_device_ids.cc
+++ b/chrome/browser/storage_monitor/transient_device_ids.cc
@@ -20,7 +20,6 @@ TransientDeviceIds::~TransientDeviceIds() {}
std::string TransientDeviceIds::GetTransientIdForDeviceId(
const std::string& device_id) {
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(StorageInfo::IsRemovableDevice(device_id));
if (!ContainsKey(device_id_map_, device_id)) {
std::string transient_id;
diff --git a/chrome/browser/storage_monitor/transient_device_ids.h b/chrome/browser/storage_monitor/transient_device_ids.h
index 8f81650..cf6396f 100644
--- a/chrome/browser/storage_monitor/transient_device_ids.h
+++ b/chrome/browser/storage_monitor/transient_device_ids.h
@@ -24,7 +24,7 @@ class TransientDeviceIds {
~TransientDeviceIds();
// Returns the transient ID for a given |device_id|.
- // |device_id| must be for a removable device.
+ // |device_id| must be for a fixed or removable storage device.
// If |device_id| has never been seen before, a new, unique transient id will
// be assigned.
std::string GetTransientIdForDeviceId(const std::string& device_id);