Remove CircularFileStream / replace it with CallSessionFileRotatingStream.

webrtc/base/logsinks.h

 /*
  *  Copyright 2015 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 21 matching lines @@
                       size_t num_log_files);
   ~FileRotatingLogSink() override;
 
   // Writes the message to the current file. It will spill over to the next
   // file if needed.
   void OnLogMessage(const std::string& message) override;
 
   // Deletes any existing files in the directory and creates a new log file.
   virtual bool Init();
 
+  // Disables buffering on the underlying stream.
+  bool DisableBuffering();
+
  protected:
   explicit FileRotatingLogSink(FileRotatingStream* stream);
 
  private:
   scoped_ptr<FileRotatingStream> stream_;
 
   DISALLOW_COPY_AND_ASSIGN(FileRotatingLogSink);
 };
 
 // Log sink that uses a CallSessionFileRotatingStream to write to disk.
 // Init() must be called before adding this sink.
 class CallSessionFileRotatingLogSink : public FileRotatingLogSink {
  public:
   CallSessionFileRotatingLogSink(const std::string& log_dir_path,
                                  size_t max_total_log_size);
   ~CallSessionFileRotatingLogSink() override;
 
  private:
-  scoped_ptr<CallSessionFileRotatingStream> stream_;
-
   DISALLOW_COPY_AND_ASSIGN(CallSessionFileRotatingLogSink);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_FILE_ROTATING_LOG_SINK_H_