Move TransientDeviceId from MediFileSystemRegistry to RemovableStorageNotifications.

chrome/browser/media_gallery/media_file_system_registry.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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media_gallery/media_file_system_context.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h"
 #include "chrome/browser/media_gallery/scoped_mtp_device_map_entry.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
 #include "chrome/browser/system_monitor/removable_storage_notifications.h"
+#include "chrome/browser/system_monitor/transient_device_ids.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 352 matching lines @@
     } else {
       RevokeOldGalleries(new_galleries);
     }
 
     callback.Run(result);
   }
 
   uint64 GetTransientIdForRemovableDeviceId(const std::string& device_id) {
     if (!MediaStorageUtil::IsRemovableDevice(device_id))
       return 0;
-    MediaFileSystemRegistry* registry =
-        file_system_context_->GetMediaFileSystemRegistry();
-    return registry->GetTransientIdForDeviceId(device_id);
+    TransientDeviceIds* transient_ids =
+        RemovableStorageNotifications::GetInstance()->transient_device_ids();
+    return transient_ids->GetTransientIdForDeviceId(device_id);
   }
 
   // This code is deprecated and should be removed. See http://crbug.com/170138
   // Make a JSON string out of |name|, |pref_id| and |device_id|. The IDs makes
   // the combined name unique. The JSON string should not contain any slashes.
   std::string MakeJSONFileSystemName(const string16& name,
                                      const MediaGalleryPrefId& pref_id,
                                      const std::string& device_id) {
     string16 sanitized_name;
     string16 separators =
@@ skipping 204 matching lines @@
         (*extension_host_it)->RevokeGalleryByPrefId(*pref_id_it);
       }
     }
   }
 }
 
 size_t MediaFileSystemRegistry::GetExtensionHostCountForTests() const {
   return extension_hosts_map_.size();
 }
 
-uint64 MediaFileSystemRegistry::GetTransientIdForDeviceId(
-    const std::string& device_id) {
-  return transient_device_ids_.GetTransientIdForDeviceId(device_id);
-}
-
 /******************
  * Private methods
  ******************/
 
 class MediaFileSystemRegistry::MediaFileSystemContextImpl
     : public MediaFileSystemContext {
  public:
   explicit MediaFileSystemContextImpl(MediaFileSystemRegistry* registry)
       : registry_(registry) {
     DCHECK(registry_);  // Suppresses unused warning on Android.
@@ skipping 161 matching lines @@
 
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome