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

webrtc/base/fileutils.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 12 matching lines @@
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/platform_file.h"
 
 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:
   // Constructor
   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;

[kwiberg-webrtc, 2017/05/29 12:11:36]

Please don't clean up code that your CL otherwise doesn't touch (except in CLs
whose sole purpose is such cleanup). It makes reviewing harder, increases the
risk of conflicts, makes reverting harder, etc.

[AleBzk, 2017/05/29 13:04:48]

Yup. This was a left over from a previous PS in which I added a method to
DirectoryIterator.

 
  private:
   std::string directory_;
 #if defined(WEBRTC_WIN)
   WIN32_FIND_DATA data_;
   HANDLE handle_;
 #else
   DIR *dir_;
   struct dirent *dirent_;
   struct stat stat_;
@@ skipping 173 matching lines @@
  private:
   static FilesystemInterface* default_filesystem_;
 
   static FilesystemInterface *EnsureDefaultFilesystem();
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(Filesystem);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_FILEUTILS_H_