Replace scoped_ptr with unique_ptr in webrtc/call/

webrtc/call/rtc_event_log.cc

 /*
  *  Copyright (c) 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 87 matching lines @@
   void HandleEvent(rtclog::Event* event) EXCLUSIVE_LOCKS_REQUIRED(crit_);
   // Writes the event to the file. Note that this will destroy the state of the
   // input argument.
   void StoreToFile(rtclog::Event* event) EXCLUSIVE_LOCKS_REQUIRED(crit_);
   // Adds the event to the list of recent events, and removes any events that
   // are too old and no longer fall in the time window.
   void AddRecentEvent(const rtclog::Event& event)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   rtc::CriticalSection crit_;
-  rtc::scoped_ptr<FileWrapper> file_ GUARDED_BY(crit_) =
-      rtc::scoped_ptr<FileWrapper>(FileWrapper::Create());
+  std::unique_ptr<FileWrapper> file_ GUARDED_BY(crit_) =
+      std::unique_ptr<FileWrapper>(FileWrapper::Create());

[the sun, 2016/03/12 11:51:13]

Is make_unique() C++14 or C++17?

[kwiberg-webrtc, 2016/03/12 14:06:46]

C++14. Although it wouldn't be of any use here, would it? auto, on the other
hand, would have been.

[kwiberg-webrtc, 2016/03/12 14:10:05]

No, auto can’t be used here. This is a class definition.

   rtc::PlatformFile platform_file_ GUARDED_BY(crit_) =
       rtc::kInvalidPlatformFileValue;
   rtclog::EventStream stream_ GUARDED_BY(crit_);
   std::deque<rtclog::Event> recent_log_events_ GUARDED_BY(crit_);
   std::vector<rtclog::Event> config_events_ GUARDED_BY(crit_);
 
   // Microseconds to record log events, before starting the actual log.
   int64_t buffer_duration_us_ GUARDED_BY(crit_);
   bool currently_logging_ GUARDED_BY(crit_);
   int64_t start_time_us_ GUARDED_BY(crit_);
@@ skipping 46 matching lines @@
   rtclog::Event_EventType event_type = event.type();
   return event_type == rtclog::Event::VIDEO_RECEIVER_CONFIG_EVENT ||
          event_type == rtclog::Event::VIDEO_SENDER_CONFIG_EVENT ||
          event_type == rtclog::Event::AUDIO_RECEIVER_CONFIG_EVENT ||
          event_type == rtclog::Event::AUDIO_SENDER_CONFIG_EVENT;
 }
 }  // namespace
 
 // RtcEventLogImpl member functions.
 RtcEventLogImpl::RtcEventLogImpl()
     : file_(FileWrapper::Create()),

[stefan-webrtc, 2016/03/12 12:05:18]

You may not have the answer, but it seems odd to me that the file wrapper is
created here and on line 109... Maybe you can remove one of them? Preferably
line 109 since we already get the clock in the initializer list.

[kwiberg-webrtc, 2016/03/12 14:06:46]

I don’t want to do it in this CL. It’s the Unix philosophy of CLs: “do only one
thing, but do it well”.

But yes, one of them should probably go away. I don’t think we actually end up
executing more than one of them, though, so it’s just a code neatness issue.

[stefan-webrtc, 2016/03/12 14:42:39]

Sure, no problem. I was just surprised when I reviewed... One of the downsides
with having to places to initialize things, IMO.

       stream_(),
       buffer_duration_us_(10000000),
       currently_logging_(false),
       start_time_us_(0),
       duration_us_(0),
       clock_(Clock::GetRealTimeClock()) {
 }
 
 void RtcEventLogImpl::SetBufferDuration(int64_t buffer_duration_us) {
   rtc::CritScope lock(&crit_);
@@ skipping 307 matching lines @@
       config_events_.push_back(recent_log_events_.front());
     }
     recent_log_events_.pop_front();
   }
 }
 
 bool RtcEventLog::ParseRtcEventLog(const std::string& file_name,
                                    rtclog::EventStream* result) {
   char tmp_buffer[1024];
   int bytes_read = 0;
-  rtc::scoped_ptr<FileWrapper> dump_file(FileWrapper::Create());
+  std::unique_ptr<FileWrapper> dump_file(FileWrapper::Create());
   if (dump_file->OpenFile(file_name.c_str(), true) != 0) {
     return false;
   }
   std::string dump_buffer;
   while ((bytes_read = dump_file->Read(tmp_buffer, sizeof(tmp_buffer))) > 0) {
     dump_buffer.append(tmp_buffer, bytes_read);
   }
   dump_file->CloseFile();
   return result->ParseFromString(dump_buffer);
 }
 
 #endif  // ENABLE_RTC_EVENT_LOG
 
 // RtcEventLog member functions.
-rtc::scoped_ptr<RtcEventLog> RtcEventLog::Create() {
-  return rtc::scoped_ptr<RtcEventLog>(new RtcEventLogImpl());
+std::unique_ptr<RtcEventLog> RtcEventLog::Create() {
+  return std::unique_ptr<RtcEventLog>(new RtcEventLogImpl());
 }
 
 }  // namespace webrtc