ReadDirectory() added in webrtc/test/testsupport/fileutils.h

webrtc/base/fileutils.h

Index: webrtc/base/fileutils.h
diff --git a/webrtc/base/fileutils.h b/webrtc/base/fileutils.h
index cddf2dc367f45a719add0b1a71ea497769e64eaa..f9020e0c73bb369f5a1fba983a8267ce1727119f 100644
--- a/webrtc/base/fileutils.h
+++ b/webrtc/base/fileutils.h
@@ -30,14 +30,9 @@ namespace rtc {
 class FileStream;
 class Pathname;
 
-//////////////////////////
-// Directory Iterator   //
-//////////////////////////
-
 // A DirectoryIterator is created with a given directory. It originally points
 // to the first file in the directory, and can be advanecd with Next(). This
 // allows you to get information about each file.
-
 class DirectoryIterator {
   friend class Filesystem;
  public:
@@ -46,22 +41,24 @@ class DirectoryIterator {
   // Destructor
   virtual ~DirectoryIterator();
 
-  // Starts traversing a directory
-  // dir is the directory to traverse
-  // returns true if the directory exists and is valid
-  // The iterator will point to the first entry in the directory
-  virtual bool Iterate(const Pathname &path);
+  // Starts traversing a directory and returns true if the directory exists and
+  // is valid. |dir| is the directory to traverse. The iterator will point to
+  // the first entry in the directory.
+  virtual bool Iterate(const Pathname &dir);
 
-  // Advances to the next file
-  // returns true if there were more files in the directory.
+  // Advances to the next file and returns true if there were more files in the
+  // directory.
   virtual bool Next();
 
-  // returns true if the file currently pointed to is a directory
+  // Returns true if the file currently pointed to is a directory.
   virtual bool IsDirectory() const;
 
-  // returns the name of the file currently pointed to
+  // Returns the name of the file currently pointed to.
   virtual std::string Name() const;
 
+  // Returns a Pathname instance of the file currently pointed to.
+  Pathname Path() const;
+
  private:
   std::string directory_;
 #if defined(WEBRTC_WIN)