Move TransientDeviceId from MediFileSystemRegistry 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"
+#include "chrome/browser/system_monitor/transient_device_ids.h"
 
 namespace chrome {
 
 static RemovableStorageNotifications*
     g_removable_storage_notifications = NULL;
 
 RemovableStorageNotifications::StorageInfo::StorageInfo() {
 }
 
 RemovableStorageNotifications::StorageInfo::StorageInfo(
@@ skipping 32 matching lines @@
     const base::FilePath::StringType& location) {
   notifications_->ProcessAttach(
       RemovableStorageNotifications::StorageInfo(id, name, location));
 }
 
 void RemovableStorageNotifications::ReceiverImpl::ProcessDetach(
     const std::string& id) {
   notifications_->ProcessDetach(id);
 }
 
+RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
+  return g_removable_storage_notifications;

[Greg Billock, 2013/02/08 17:54:53]

Why move these above the constructor?

[vandebo (ex-Chrome), 2013/02/09 00:49:16]

Definition order should match declaration order.

+}
+
+std::vector<RemovableStorageNotifications::StorageInfo>
+RemovableStorageNotifications::GetAttachedStorage() const {
+  std::vector<StorageInfo> results;
+
+  base::AutoLock lock(storage_lock_);
+  for (RemovableStorageMap::const_iterator it = storage_map_.begin();
+       it != storage_map_.end();
+       ++it) {
+    results.push_back(it->second);
+  }
+  return results;
+}
+
+void RemovableStorageNotifications::AddObserver(RemovableStorageObserver* obs) {
+  observer_list_->AddObserver(obs);
+}
+
+void RemovableStorageNotifications::RemoveObserver(
+    RemovableStorageObserver* obs) {
+  observer_list_->RemoveObserver(obs);
+}
+
+TransientDeviceIds*
+RemovableStorageNotifications::transient_device_ids() const {
+  return transient_device_ids_.get();
+}
+
 RemovableStorageNotifications::RemovableStorageNotifications()
-    : observer_list_(
-          new ObserverListThreadSafe<RemovableStorageObserver>()) {
+    : observer_list_(new ObserverListThreadSafe<RemovableStorageObserver>()),
+      transient_device_ids_(new TransientDeviceIds) {
   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;
 }
@@ skipping 30 matching lines @@
       return;
     info = it->second;
     storage_map_.erase(it);
   }
 
   DVLOG(1) << "RemovableStorageDetached for id " << id;
   observer_list_->Notify(
       &RemovableStorageObserver::OnRemovableStorageDetached, info);
 }
 
-std::vector<RemovableStorageNotifications::StorageInfo>
-RemovableStorageNotifications::GetAttachedStorage() const {
-  std::vector<StorageInfo> results;
-
-  base::AutoLock lock(storage_lock_);
-  for (RemovableStorageMap::const_iterator it = storage_map_.begin();
-       it != storage_map_.end();
-       ++it) {
-    results.push_back(it->second);
-  }
-  return results;
-}
-
-void RemovableStorageNotifications::AddObserver(RemovableStorageObserver* obs) {
-  observer_list_->AddObserver(obs);
-}
-
-void RemovableStorageNotifications::RemoveObserver(
-    RemovableStorageObserver* obs) {
-  observer_list_->RemoveObserver(obs);
-}
-
-RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
-  return g_removable_storage_notifications;
-}
-
 }  // namespace chrome