Revert 167606 - [Media Gallery][ChromeOS] Improve device media gallery names.

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 {
 
 class MockDiskMountManager : public DiskMountManager {
  public:
   MockDiskMountManager();
@@ skipping 24 matching lines @@
   void NotifyDeviceRemoveEvents();
 
   // Sets up default results for mock methods.
   void SetupDefaultReplies();
 
   // Creates a fake disk entry for the mounted device. This function is
   // primarily for RemovableDeviceNotificationsTest.
   void CreateDiskEntryForMountDevice(
       const DiskMountManager::MountPointInfo& mount_info,
       const std::string& device_id,
-      const std::string& device_label,
-      const std::string& vendor_name,
-      const std::string& product_name,
-      DeviceType device_type,
-      uint64 total_size_in_bytes);
+      const std::string& device_label);
 
   // Removes the fake disk entry associated with the mounted device. This
   // function is primarily for RemovableDeviceNotificationsTest.
   void RemoveDiskEntryForMountDevice(
       const DiskMountManager::MountPointInfo& mount_info);
 
  private:
   // Is used to implement AddObserver.
   void AddObserverInternal(DiskMountManager::Observer* observer);
 
@@ skipping 26 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_