FileWrapper[Impl] modifications and actually remove the "Impl" class.

webrtc/system_wrappers/include/file_wrapper.h

Index: webrtc/system_wrappers/include/file_wrapper.h
diff --git a/webrtc/system_wrappers/include/file_wrapper.h b/webrtc/system_wrappers/include/file_wrapper.h
index b32a62f2f976417e8e8ee99d26a79e0ccdcee88f..81ff53383a458915dc122e87ff0ac1ef2476c7c0 100644
--- a/webrtc/system_wrappers/include/file_wrapper.h
+++ b/webrtc/system_wrappers/include/file_wrapper.h
@@ -14,6 +14,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
 #include "webrtc/typedefs.h"
 
@@ -22,55 +23,65 @@
 
 namespace webrtc {
 
+// TODO(tommi): Remove the base classes, rename to rtc::File and move to base.
 class FileWrapper : public InStream, public OutStream {
  public:
   static const size_t kMaxFileNameSize = 1024;
 
-  // Factory method. Constructor disabled.
+  // Factory methods.
+  // TODO(tommi): Remove Create().
   static FileWrapper* Create();
+  static FileWrapper Open(const char* file_name_utf8, bool read_only);
+
+  FileWrapper(FILE* file, size_t max_size);
+  ~FileWrapper() override;
+
+  // Support for move semantics.
+  FileWrapper(FileWrapper&& other);
+  FileWrapper& operator=(FileWrapper&& other);
 
   // Returns true if a file has been opened.
-  virtual bool Open() const = 0;
+  bool is_open() const { return file_ != nullptr; }
 
   // Opens a file in read or write mode, decided by the read_only parameter.
-  virtual int OpenFile(const char* file_name_utf8,
-                       bool read_only,
-                       bool loop = false,
-                       bool text = false) = 0;
+  int OpenFile(const char* file_name_utf8, bool read_only);

[åsapersson, 2016/06/14 15:22:12]

make method return bool?

[tommi, 2016/06/14 20:45:34]

Done.

 
   // Initializes the wrapper from an existing handle. |read_only| must match in

[åsapersson, 2016/06/14 15:22:12]

update comment..

[tommi, 2016/06/14 20:45:34]

Done.

   // the mode the file was opened in. If |manage_file| is true, the wrapper
   // takes ownership of |handle| and closes it in CloseFile().
-  virtual int OpenFromFileHandle(FILE* handle,
-                                 bool manage_file,
-                                 bool read_only,
-                                 bool loop = false) = 0;
+  int OpenFromFileHandle(FILE* handle);

[åsapersson, 2016/06/14 15:22:12]

return bool?

[tommi, 2016/06/14 20:45:34]

Done.

 
-  virtual int CloseFile() = 0;
+  void CloseFile();
 
   // Limits the file size to |bytes|. Writing will fail after the cap
   // is hit. Pass zero to use an unlimited size.
-  virtual int SetMaxFileSize(size_t bytes)  = 0;
-
-  // Flush any pending writes.
-  virtual int Flush() = 0;
-
-  // Returns the opened file's name in |file_name_utf8|. Provide the size of
-  // the buffer in bytes in |size|. The name will be truncated if |size| is
-  // too small.
-  virtual int FileName(char* file_name_utf8,
-                       size_t size) const = 0;
-
-  // Write |format| to the opened file. Arguments are taken in the same manner
-  // as printf. That is, supply a format string containing text and
-  // specifiers. Returns the number of characters written or -1 on error.
-  virtual int WriteText(const char* format, ...) = 0;
-
-  // Inherited from both Instream and OutStream.
-  // Rewinds the file to the start. Only available when OpenFile() has been
-  // called with |loop| == true or |readOnly| == true.
-  // virtual int Rewind() = 0;
+  // TODO(tommi): Could we move this out into a separate class?
+  int SetMaxFileSize(size_t bytes);

[åsapersson, 2016/06/14 15:22:12]

void?

[tommi, 2016/06/14 20:45:34]

Done.

+
+  // Flush any pending writes.  Note: Flushing when closing, is not required.
+  int Flush();
+
+  // Rewinds the file to the start.
   int Rewind() override;
+  int Read(void* buf, size_t length) override;
+  bool Write(const void* buf, size_t length) override;
+
+ private:
+  FileWrapper();
+
+  void CloseFileImpl();
+  int FlushImpl();
+
+  // TODO(tommi): Remove the lock.
+  rtc::CriticalSection lock_;
+
+  FILE* file_ = nullptr;
+  size_t position_ = 0;
+  size_t max_size_in_bytes_ = 0;
+
+  // Copying is not supported.
+  FileWrapper(const FileWrapper&) = delete;
+  FileWrapper& operator=(const FileWrapper&) = delete;
 };
 
 }  // namespace webrtc