CrOS: Convert MediaTransferProtocolDaemonClient to use protobufs.

chromeos/dbus/media_transfer_protocol_daemon_client.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.
 
 // Client code to talk to the Media Transfer Protocol daemon. The MTP daemon is
 // responsible for communicating with PTP / MTP capable devices like cameras
 // and smartphones.
 
 #ifndef CHROMEOS_DBUS_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
 #define CHROMEOS_DBUS_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/time.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
+#include "chromeos/dbus/mtp_file_entry.pb.h"
 
 namespace dbus {
 class Bus;
-class Response;
 }
 
+class MtpStorageInfo;
+
 namespace chromeos {
 
 // Mode to open a storage in.
 enum OpenStorageMode {
   OPEN_STORAGE_MODE_READ_ONLY,
 };
 
-// Values match libmtp values unless noted below.
-// TODO(thestig) See if we can do better than this.
-enum FileType {

[Lei Zhang, 2012/09/01 00:46:34]

I hate to have this enum to match the one in the protobuf, to match the one in
libmtp. However, if I get rid of this, then the chromeos_test_support target
will depend on the mtp_file_entry_proto target.

[satorux1, 2012/09/01 01:03:50]

that sounds ok to me. mtp_file_entry_proto target is small.

-  FILE_TYPE_FOLDER = 0,
-  FILE_TYPE_JPEG = 14,
-  FILE_TYPE_JFIF = 15,
-  FILE_TYPE_TIFF = 16,
-  FILE_TYPE_BMP = 17,
-  FILE_TYPE_GIF = 18,
-  FILE_TYPE_PICT = 19,
-  FILE_TYPE_PNG = 20,
-  FILE_TYPE_WINDOWSIMAGEFORMAT = 25,
-  FILE_TYPE_JP2 = 40,
-  FILE_TYPE_JPX = 41,
-  // Truly unknown file type.
-  FILE_TYPE_UNKNOWN = 44,
-  // There's more file types to map to, but right now they are not interesting.
-  // Just assign a dummy value for now.
-  FILE_TYPE_OTHER = 9999
-};
-
 // A class to represent information about a storage sent from mtpd.
 class CHROMEOS_EXPORT StorageInfo {
  public:
   StorageInfo();
-  StorageInfo(const std::string& storage_name, dbus::Response* response);
+  StorageInfo(const std::string& storage_name,
+              const MtpStorageInfo& storage_info);
   ~StorageInfo();
 
   // Storage name. (e.g. usb:1,5:65537)
   const std::string& storage_name() const { return storage_name_; }
 
   // Vendor. (e.g. Kodak)
   const std::string& vendor() const { return vendor_; }
 
   // Vendor ID. (e.g. 0x040a)
   uint16 vendor_id() const { return vendor_id_; }
@@ skipping 27 matching lines @@
 
   // Storage description. (e.g. internal memory)
   const std::string& storage_description() const {
     return storage_description_;
   }
 
   // Volume identifier. (e.g. the serial number, should be unique)
   const std::string& volume_identifier() const { return volume_identifier_; }
 
  private:
-  void InitializeFromResponse(dbus::Response* response);
-
   // Device info. (A device can have multiple storages)
   std::string vendor_;
   uint16 vendor_id_;
   std::string product_;
   uint16 product_id_;
   uint32 device_flags_;
 
   // Storage info.
   std::string storage_name_;
   uint16 storage_type_;
   uint16 filesystem_type_;
   uint16 access_capability_;
   uint64 max_capacity_;
   uint64 free_space_in_bytes_;
   uint64 free_space_in_objects_;
   std::string storage_description_;
   std::string volume_identifier_;
 };
 
 // A class to represent information about a file entry sent from mtpd.
 class CHROMEOS_EXPORT FileEntry {
  public:
   FileEntry();
-  explicit FileEntry(dbus::Response* response);
+  explicit FileEntry(const MtpFileEntry& entry);
   ~FileEntry();
 
   // ID for the file.
   uint32 item_id() const { return item_id_; }
 
   // ID for the file's parent.
   uint32 parent_id() const { return parent_id_; }
 
   // Name of the file.
   const std::string& file_name() const { return file_name_; }
 
   // Size of the file.
   uint64 file_size() const { return file_size_; }
 
   // Modification time of the file.
-  base::Time modification_date() const { return modification_date_; }
+  base::Time modification_time() const { return modification_time_; }
 
   // File type.
-  FileType file_type() const { return file_type_; }
+  MtpFileEntry_FileType file_type() const { return file_type_; }
 
  private:
-  void InitializeFromResponse(dbus::Response* response);
-
   // Storage info.
   uint32 item_id_;
   uint32 parent_id_;
   std::string file_name_;
   uint64 file_size_;
-  base::Time modification_date_;
-  FileType file_type_;
+  base::Time modification_time_;
+  MtpFileEntry_FileType file_type_;
 };
 
 // A class to make the actual DBus calls for mtpd service.
 // This class only makes calls, result/error handling should be done
 // by callbacks.
 class CHROMEOS_EXPORT MediaTransferProtocolDaemonClient {
  public:
   // A callback to be called when DBus method call fails.
   typedef base::Callback<void()> ErrorCallback;
 
@@ skipping 124 matching lines @@
   // Create() should be used instead.
   MediaTransferProtocolDaemonClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaTransferProtocolDaemonClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MEDIA_TRANSFER_PROTOCOL_DAEMON_CLIENT_H_