Redesigned and refactored ScopedMTPDeviceMapEntry, MTPDeviceMapService & MTPDeviceDelegate classes.

chrome/browser/media_gallery/media_file_system_registry_unittest.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 unit tests.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 44 matching lines @@
   explicit TestMediaFileSystemContext(MediaFileSystemRegistry* registry);
   virtual ~TestMediaFileSystemContext() {}
 
   // MediaFileSystemContext implementation.
   virtual std::string RegisterFileSystemForMassStorage(
       const std::string& device_id, const FilePath& path) OVERRIDE;
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   virtual std::string RegisterFileSystemForMTPDevice(
       const std::string& device_id, const FilePath& path,
-      scoped_refptr<ScopedMTPDeviceMapEntry>* entry) OVERRIDE;
+      const ExtensionGalleriesHost* galleries_host) OVERRIDE;
+
+  virtual void RemoveMTPDeviceReferenceForHost(
+      const std::string& device_location,
+      const chrome::ExtensionGalleriesHost* galleries_host) OVERRIDE;
 #endif
 
   virtual void RevokeFileSystem(const std::string& fsid) OVERRIDE;
 
  private:
   std::string AddFSEntry(const std::string& device_id, const FilePath& path);
 
   MediaFileSystemRegistry* registry_;
 
   // A counter used to construct mock FSIDs.
@@ skipping 28 matching lines @@
 
 std::string TestMediaFileSystemContext::RegisterFileSystemForMassStorage(
     const std::string& device_id, const FilePath& path) {
   CHECK(MediaStorageUtil::IsMassStorageDevice(device_id));
   return AddFSEntry(device_id, path);
 }
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
 std::string TestMediaFileSystemContext::RegisterFileSystemForMTPDevice(
     const std::string& device_id, const FilePath& path,
-    scoped_refptr<ScopedMTPDeviceMapEntry>* entry) {
+    const ExtensionGalleriesHost* galleries_host) {
   CHECK(!MediaStorageUtil::IsMassStorageDevice(device_id));
-  DCHECK(entry);
-  *entry = registry_->GetOrCreateScopedMTPDeviceMapEntry(path.value());
+  registry_->AddGalleriesHostReferenceForMTPDevice(path.value(),
+                                                   galleries_host);
   return AddFSEntry(device_id, path);
 }
+
+void TestMediaFileSystemContext::RemoveMTPDeviceReferenceForHost(
+    const std::string& device_location,
+    const chrome::ExtensionGalleriesHost* galleries_host) {
+  registry_->RemoveGalleriesHostReferenceForMTPDevice(device_location,
+                                                      galleries_host);
+}
 #endif
 
 void TestMediaFileSystemContext::RevokeFileSystem(const std::string& fsid) {
   if (!ContainsKey(file_systems_by_id_, fsid))
     return;
   EXPECT_EQ(1U, file_systems_by_id_.erase(fsid));
 }
 
 std::string TestMediaFileSystemContext::AddFSEntry(const std::string& device_id,
                                                    const FilePath& path) {
@@ skipping 499 matching lines @@
   SetGalleryPermission(0, GetProfileState(0)->all_permission_extension(),
                        device_id, true /*has access*/);
   auto_galleries.push_back(added_info);
   GetProfileState(0)->CheckGalleries("user added all", added_galleries,
                                      auto_galleries);
 }
 
 }  // namespace
 
 }  // namespace chrome