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

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 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 36 matching lines @@
 #define STR_NCASE_CMP(s1, s2, n) ::_strnicmp(s1, s2, n)
 #else
 #define STR_CASE_CMP(s1, s2) ::strcasecmp(s1, s2)
 #define STR_NCASE_CMP(s1, s2, n) ::strncasecmp(s1, s2, n)
 #endif
 
 namespace webrtc {
 
 class Config;
 
-class InStream
-{
-public:
- // Reads |length| bytes from file to |buf|. Returns the number of bytes read
- // or -1 on error.
-    virtual int Read(void *buf, size_t len) = 0;
-    virtual int Rewind();
-    virtual ~InStream() {}
-protected:
-    InStream() {}
+class RewindableStream {
+ public:
+  virtual ~RewindableStream() {}
+  virtual int Rewind() = 0;
 };
 
-class OutStream
-{
-public:
- // Writes |length| bytes from |buf| to file. The actual writing may happen
- // some time later. Call Flush() to force a write.
-    virtual bool Write(const void *buf, size_t len) = 0;
-    virtual int Rewind();
-    virtual ~OutStream() {}
-protected:
-    OutStream() {}
+class InStream : public RewindableStream {
+ public:
+  // Reads |length| bytes from file to |buf|. Returns the number of bytes read

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

|len|

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

Done.

+  // or -1 on error.
+  virtual int Read(void* buf, size_t len) = 0;
+};
+
+class OutStream : public RewindableStream {
+ public:
+  // Writes |length| bytes from |buf| to file. The actual writing may happen
+  // some time later. Call Flush() to force a write.
+  virtual bool Write(const void* buf, size_t len) = 0;
 };
 
 enum TraceModule
 {
     kTraceUndefined              = 0,
     // not a module, triggered from the engine code
     kTraceVoice                  = 0x0001,
     // not a module, triggered from the engine code
     kTraceVideo                  = 0x0002,
     // not a module, triggered from the utility code
@@ skipping 824 matching lines @@
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 enum NetworkState {
   kNetworkUp,
   kNetworkDown,
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_