Move TransientDeviceId from MediFileSystemRegistry to RemovableStorageNotifications.

chrome/browser/system_monitor/removable_storage_notifications.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_
 
 #include "base/file_path.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 
 class ChromeBrowserMainPartsLinux;
 class ChromeBrowserMainPartsMac;
 class MediaGalleriesPrivateApiTest;
 
 namespace chrome {
 
 class MediaFileSystemRegistryTest;
 class RemovableStorageObserver;
+class TransientDeviceIds;
 
 // Base class for platform-specific instances watching for removable storage
 // attachments/detachments.
 class RemovableStorageNotifications {
  public:
   struct StorageInfo {
     StorageInfo();
     StorageInfo(const std::string& id,
                 const string16& device_name,
                 const base::FilePath::StringType& device_location);
@@ skipping 45 matching lines @@
       string16* device_location,
       string16* storage_object_id) const = 0;
 #endif
 
   // Returns information for attached removable storage.
   std::vector<StorageInfo> GetAttachedStorage() const;
 
   void AddObserver(RemovableStorageObserver* obs);
   void RemoveObserver(RemovableStorageObserver* obs);
 
+  TransientDeviceIds* transient_device_ids() const;
+
  protected:
   RemovableStorageNotifications();
   virtual ~RemovableStorageNotifications();
 
   // TODO(gbillock): Clean up ownerships and get rid of these friends.
   friend class ::ChromeBrowserMainPartsLinux;
   friend class ::ChromeBrowserMainPartsMac;
   friend class ::MediaGalleriesPrivateApiTest;
   friend class MediaFileSystemRegistryTest;
 
@@ skipping 11 matching lines @@
   scoped_ptr<Receiver> receiver_;
 
   scoped_refptr<ObserverListThreadSafe<RemovableStorageObserver> >
       observer_list_;
 
   // For manipulating removable_storage_map_ structure.
   mutable base::Lock storage_lock_;
 
   // Map of all the attached removable storage devices.
   RemovableStorageMap storage_map_;
+
+  scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 } // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_