Cleanup: Fix some misc issues in Linux media galleries MTP code.

chrome/browser/media_galleries/linux/mtp_device_object_enumerator.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_MEDIA_GALLERIES_LINUX_MTP_DEVICE_OBJECT_ENUMERATOR_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_OBJECT_ENUMERATOR_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
 #include "device/media_transfer_protocol/mtp_file_entry.pb.h"
 
 // Used to enumerate top-level files of an media file system.
 class MTPDeviceObjectEnumerator {
  public:
   explicit MTPDeviceObjectEnumerator(const std::vector<MtpFileEntry>& entries);
 
   ~MTPDeviceObjectEnumerator();
 
   base::FilePath Next();
   int64 Size();
   bool IsDirectory();
   base::Time LastModifiedTime();
 
   // If the current file entry is valid, returns true and fills in |entry_id|
   // with the entry identifier else returns false and |entry_id| is not set.
-  bool GetEntryId(uint32_t* entry_id) const;

[tommycli, 2014/07/09 19:14:42]

base/basictypes.h says to use uint32_t

[Lei Zhang, 2014/07/09 19:21:40]

That happened 6 months ago and all this code was written before then. I'll
switch everything over to the _t version in a follow-up CL.

+  bool GetEntryId(uint32* entry_id) const;
 
  private:
   // Returns true if the enumerator has more entries to traverse, false
   // otherwise.
   bool HasMoreEntries() const;
 
   // Returns true if Next() has been called at least once, and the enumerator
   // has more entries to traverse.
   bool IsIndexReadyAndInRange() const;
 
   // List of directory file entries information.
   const std::vector<MtpFileEntry> file_entries_;
 
   // Index into |file_entries_|.
   // Should only be used when |is_index_ready_| is true.
   size_t index_;
 
   // Initially false. Set to true after Next() has been called.
   bool is_index_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(MTPDeviceObjectEnumerator);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_LINUX_MTP_DEVICE_OBJECT_ENUMERATOR_H_