Adds a new removable storage provider for imageWriterPrivate on Chrome OS

chromeos/disks/mock_disk_mount_manager.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 CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_
 #define CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_
 
 #include <string>
 
 #include "base/observer_list.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace disks {
 

[tbarzic, 2014/03/22 02:01:02]

can you file a bug against me to replace MockDisakManager with a fake
implementation; and add a 
TODO(tbarzic): Replace the mock with a fake implementation (crbug.com/<issue#>).

[Drew Haven, 2014/03/24 22:33:25]

Done.

 class MockDiskMountManager : public DiskMountManager {
  public:
   MockDiskMountManager();
   virtual ~MockDiskMountManager();
 
   // DiskMountManager override.
   MOCK_METHOD0(Init, void(void));
   MOCK_METHOD1(AddObserver, void(DiskMountManager::Observer*));
   MOCK_METHOD1(RemoveObserver, void(DiskMountManager::Observer*));
   MOCK_CONST_METHOD0(disks, const DiskMountManager::DiskMap&(void));
@@ skipping 31 matching lines @@
       const std::string& vendor_name,
       const std::string& product_name,
       DeviceType device_type,
       uint64 total_size_in_bytes);
 
   // Removes the fake disk entry associated with the mounted device. This
   // function is primarily for StorageMonitorTest.
   void RemoveDiskEntryForMountDevice(
       const DiskMountManager::MountPointInfo& mount_info);
 
+  // Adds a fake disk entry.  This takes ownership of the pointer.

[hashimoto, 2014/03/24 04:37:09]

You should use scoped_ptr instead of having this kind of comment.
http://www.chromium.org/developers/smart-pointer-guidelines

[Drew Haven, 2014/03/24 22:33:25]

Done.

+  void AddDiskEntry(Disk* disk);

[tbarzic, 2014/03/22 02:01:02]

you can use CreateDiskEntryForMountDevice/RemoveDiskEntryForMountDevice (with
extra arguments that you need) instead creating new methods that essentially do
the same thing.

[hashimoto, 2014/03/24 04:37:09]

+1

[Drew Haven, 2014/03/24 22:33:25]

The reason I wanted this was because many of the parameters that are set by
CreateDiskEntryForMountDevice are fixed and I wanted to do a more precise test
to be sure that we really only list the devices we expect, e.g. combinations of
hidden, non-parent, and os-devices.

This might be a bit too much of a characterization test and duplicating
application logic in a test, but I wanted to be sure we were doing what we
expected in this case.

If you think it's really over-specifying things, I can remove these functions
and just fall back to using one major positive-case.

[tbarzic, 2014/03/24 22:48:42]

What I had in mind was to change 
CreateDiskEntryForMountDevice(<current_args>)
to
CreateDiskEntryForMountDevice(<current_args>, is_parent, has_media,
on_boot_device), so it can set the values you need.

+
+  // Removes a fake disk entry.  This will delete the pointer.
+  void RemoveDiskEntry(Disk* disk);

[hashimoto, 2014/03/24 04:37:09]

Why don't you pass device_path to this method?

[Drew Haven, 2014/03/24 22:33:25]

Done.

+
  private:
   // Is used to implement AddObserver.
   void AddObserverInternal(DiskMountManager::Observer* observer);
 
   // Is used to implement RemoveObserver.
   void RemoveObserverInternal(DiskMountManager::Observer* observer);
 
   // Is used to implement disks.
   const DiskMountManager::DiskMap& disksInternal() const { return disks_; }
 
@@ skipping 20 matching lines @@
   // The list of existing mount points.
   DiskMountManager::MountPointMap mount_points_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDiskMountManager);
 };
 
 }  // namespace disks
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DISKS_MOCK_DISK_MOUNT_MANAGER_H_