Add a receiver interface to RemovableStorageNotifications.

chrome/browser/system_monitor/removable_storage_notifications.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.
 
 #include "chrome/browser/system_monitor/removable_storage_notifications.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/removable_storage_observer.h"
 
 namespace chrome {
 
 static RemovableStorageNotifications*
     g_removable_storage_notifications = NULL;
 
 RemovableStorageNotifications::StorageInfo::StorageInfo() {
 }
 
 RemovableStorageNotifications::StorageInfo::StorageInfo(
     const std::string& id,
     const string16& device_name,
     const FilePath::StringType& device_location)
     : device_id(id),
       name(device_name),
       location(device_location) {
 }
 
+class RemovableStorageNotifications::ReceiverImpl
+    : public RemovableStorageNotifications::Receiver {
+ public:
+  explicit ReceiverImpl(RemovableStorageNotifications* notifications)
+      : notifications_(notifications) {}
+
+  virtual ~ReceiverImpl() {}
+
+  void ProcessAttach(
+      const RemovableStorageNotifications::StorageInfo& info) OVERRIDE;
+
+  void ProcessDetach(const std::string& id) OVERRIDE;
+
+ private:
+  RemovableStorageNotifications* notifications_;
+};
+
+void RemovableStorageNotifications::ReceiverImpl::ProcessAttach(
+    const RemovableStorageNotifications::StorageInfo& info) {
+  notifications_->ProcessAttach(info);
+}
+
+void RemovableStorageNotifications::ReceiverImpl::ProcessDetach(
+    const std::string& id) {
+  notifications_->ProcessDetach(id);
+}
+
 RemovableStorageNotifications::RemovableStorageNotifications()
     : observer_list_(
           new ObserverListThreadSafe<RemovableStorageObserver>()) {
+  receiver_.reset(new ReceiverImpl(this));
+
   DCHECK(!g_removable_storage_notifications);
   g_removable_storage_notifications = this;
 }
 
 RemovableStorageNotifications::~RemovableStorageNotifications() {
   DCHECK_EQ(this, g_removable_storage_notifications);
   g_removable_storage_notifications = NULL;
 }
 
 void RemovableStorageNotifications::ProcessAttach(
-    const std::string& id,
-    const string16& name,
-    const FilePath::StringType& location) {
-  StorageInfo info(id, name, location);
+    const StorageInfo& info) {
   {
     base::AutoLock lock(storage_lock_);
-    if (ContainsKey(storage_map_, id)) {
+    if (ContainsKey(storage_map_, info.device_id)) {
       // This can happen if our unique id scheme fails. Ignore the incoming
       // non-unique attachment.
       return;
     }
-    storage_map_.insert(std::make_pair(id, info));
+    storage_map_.insert(std::make_pair(info.device_id, info));
   }
 
-  DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(name)
-           << " and id " << id;
+  DVLOG(1) << "RemovableStorageAttached with name " << UTF16ToUTF8(info.name)
+           << " and id " << info.device_id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageAttached, info);
 }
 
-void RemovableStorageNotifications::ProcessDetach(
-    const std::string& id) {
+void RemovableStorageNotifications::ProcessDetach(const std::string& id) {
   StorageInfo info;
   {
     base::AutoLock lock(storage_lock_);
     RemovableStorageMap::iterator it = storage_map_.find(id);
     if (it == storage_map_.end())
       return;
     info = it->second;
     storage_map_.erase(it);
   }
 
@@ skipping 22 matching lines @@
 void RemovableStorageNotifications::RemoveObserver(
     RemovableStorageObserver* obs) {
   observer_list_->RemoveObserver(obs);
 }
 
 RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
   return g_removable_storage_notifications;
 }
 
 }  // namespace chrome