commit 00aac5aacfa1778cafa1a67036743df990e21153
author Tommi <tommi@webrtc.org> Mon May 25 11:25:59 2015 +0200
committer Tommi <tommi@webrtc.org> Mon May 25 09:26:08 2015 +0000
tree 2f6af82c85402af2de0cec9e5f1e88d37ef3922c
parent 23edcff7a92d42898f86ab7d08e518d16f31c492

Some cleanup for base/logging and base/stream.h

* Fix race when calling UpdateMinLogSeverity
* Remove unused 'diagnostic mode'
* Remove LogToStream
* Fix ctor of StringStream
* Delete POpenStream
* Delete AsyncWriteStream
* Delete CircularFileStream
* Delete StreamSegment

BUG=
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/57429004

Cr-Commit-Position: refs/heads/master@{#9273}

webrtc/base/logging_unittest.cc

diff --git a/webrtc/base/logging_unittest.cc b/webrtc/base/logging_unittest.cc
index db744b5..58ad6b7 100644
--- a/webrtc/base/logging_unittest.cc
+++ b/webrtc/base/logging_unittest.cc
@@ -25,13 +25,8 @@
  public:
   LogSinkImpl() {}
 
-  // The non-const reference constructor is required because of StringStream.
-  // TODO(tommi): Fix StringStream to accept a pointer for non-const.
   template<typename P>
-  explicit LogSinkImpl(P& p) : Base(p) {}
-
-  template<typename P>
-  explicit LogSinkImpl(const P& p) : Base(p) {}
+  explicit LogSinkImpl(P* p) : Base(p) {}
 
  private:
   void OnLogMessage(const std::string& message) override {
@@ -46,7 +41,7 @@
   int sev = LogMessage::GetLogToStream(NULL);
 
   std::string str;
-  LogSinkImpl<StringStream> stream(str);
+  LogSinkImpl<StringStream> stream(&str);
   LogMessage::AddLogToStream(&stream, LS_INFO);
   EXPECT_EQ(LS_INFO, LogMessage::GetLogToStream(&stream));
 
@@ -68,7 +63,7 @@
   int sev = LogMessage::GetLogToStream(NULL);
 
   std::string str1, str2;
-  LogSinkImpl<StringStream> stream1(str1), stream2(str2);
+  LogSinkImpl<StringStream> stream1(&str1), stream2(&str2);
   LogMessage::AddLogToStream(&stream1, LS_INFO);
   LogMessage::AddLogToStream(&stream2, LS_VERBOSE);
   EXPECT_EQ(LS_INFO, LogMessage::GetLogToStream(&stream1));