CrOS: Convert MediaTransferProtocolDaemonClient to use protobufs.

chrome/browser/chromeos/mtp/media_transfer_protocol_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 CHROME_BROWSER_CHROMEOS_MTP_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_MTP_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
 
 #include <string>
 #include <vector>
 
+#include "base/callback.h"
 #include "chromeos/dbus/media_transfer_protocol_daemon_client.h"
 
+class MtpFileEntry;
+class MtpStorageInfo;
+
 namespace chromeos {
 namespace mtp {
 
 // This class handles the interaction with mtpd.
 // Other classes can add themselves as observers.
 class MediaTransferProtocolManager {
  public:
   // A callback to handle the result of OpenStorage.
   // The first argument is the returned handle.
   // The second argument is true if there was an error.
   typedef base::Callback<void(const std::string& handle,
                               bool error)> OpenStorageCallback;
 
   // A callback to handle the result of CloseStorage.
   // The argument is true if there was an error.
   typedef base::Callback<void(bool error)> CloseStorageCallback;
 
   // A callback to handle the result of ReadDirectoryByPath/Id.
   // The first argument is a vector of file entries.
   // The second argument is true if there was an error.
-  typedef base::Callback<void(const std::vector<FileEntry>& file_entries,
+  typedef base::Callback<void(const std::vector<MtpFileEntry>& file_entries,
                               bool error)> ReadDirectoryCallback;
 
   // A callback to handle the result of ReadFileByPath/Id.
   // The first argument is a string containing the file data.
   // The second argument is true if there was an error.
   // TODO(thestig) Consider using a file descriptor instead of the data.
   typedef base::Callback<void(const std::string& data,
                               bool error)> ReadFileCallback;
 
   // A callback to handle the result of GetFileInfoByPath/Id.
   // The first argument is a file entry.
   // The second argument is true if there was an error.
-  typedef base::Callback<void(const FileEntry& file_entry,
+  typedef base::Callback<void(const MtpFileEntry& file_entry,
                               bool error)> GetFileInfoCallback;
 
   // Implement this interface to be notified about MTP storage
   // attachment / detachment events.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // A function called after a MTP storage has been attached / detached.
     virtual void StorageChanged(bool is_attached,
                                 const std::string& storage_name) = 0;
   };
 
   virtual ~MediaTransferProtocolManager() {}
 
   // Adds an observer.
   virtual void AddObserver(Observer* observer) = 0;
 
   // Removes an observer.
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // Returns a vector of available MTP storages.
   virtual const std::vector<std::string> GetStorages() const = 0;
 
   // On success, returns the the metadata for |storage_name|.
   // Otherwise returns NULL.
-  virtual const StorageInfo* GetStorageInfo(
+  virtual const MtpStorageInfo* GetStorageInfo(
       const std::string& storage_name) const = 0;
 
   // Opens |storage_name| in |mode| and runs |callback|.
   virtual void OpenStorage(const std::string& storage_name,
                            OpenStorageMode mode,
                            const OpenStorageCallback& callback) = 0;
 
   // Close |storage_handle| and runs |callback|.
   virtual void CloseStorage(const std::string& storage_handle,
                             const CloseStorageCallback& callback) = 0;
@@ skipping 39 matching lines @@
 
   // Returns a pointer to the global MediaTransferProtocolManager instance.
   // Initialize() should already have been called.
   static MediaTransferProtocolManager* GetInstance();
 };
 
 }  // namespace mtp
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_MTP_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_