Revert 236034 "Incorporating logging into Cast: "

> Incorporating logging into Cast: 
> 1. Adding logging to CastEnvironment.
> 2. Actually triggering logging within the cast library.
> 3. Adding thread checks.
> 4. Removing trace calls outside of the logging class.
> 
> Open issues: 
> 1.Use of rtp_timestamp and frame id is not consistent.
> In addition, the AudioBus does not include these values.
> 2. There is a pending cl to switch frame_id to int. This cl does not include that.
> 3. There are a few more places to add logging.
> 
> As this cl is already big enough, all of the above will come in a follow-up cl.
> 
> Review URL: https://codereview.chromium.org/69603002

TBR=mikhal@google.com

Review URL: https://codereview.chromium.org/72143003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236036 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 4 insertions, 17 deletions

diff --git a/media/cast/video_sender/video_encoder.cc b/media/cast/video_sender/video_encoder.cc
index adc08c1..a4f350a 100644
--- a/media/cast/video_sender/video_encoder.cc
+++ b/media/cast/video_sender/video_encoder.cc
@@ -66,9 +66,6 @@ void VideoEncoder::EncodeVideoFrameEncoderThread(
       dynamic_config.latest_frame_id_to_reference);
   vp8_encoder_->UpdateRates(dynamic_config.bit_rate);
 
-  uint32 rtp_timestamp = GetVideoRtpTimestamp(capture_time);
-  cast_environment_->Logging()->InsertFrameEvent(kVideoFrameSentToEncoder,
-      rtp_timestamp, kFrameIdUnknown);
   scoped_ptr<EncodedVideoFrame> encoded_frame(new EncodedVideoFrame());
   bool retval = vp8_encoder_->Encode(*video_frame, encoded_frame.get());
 
@@ -84,8 +81,6 @@ void VideoEncoder::EncodeVideoFrameEncoderThread(
     VLOG(1) << "Encoding resulted in an empty frame";
     return;
   }
-  cast_environment_->Logging()->InsertFrameEvent(kVideoFrameEncoded,
-      rtp_timestamp, kFrameIdUnknown);
   cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE,
       base::Bind(frame_encoded_callback,
           base::Passed(&encoded_frame), capture_time));
diff --git a/media/cast/video_sender/video_encoder_unittest.cc b/media/cast/video_sender/video_encoder_unittest.cc
index b492e70..a68db22 100644
--- a/media/cast/video_sender/video_encoder_unittest.cc
+++ b/media/cast/video_sender/video_encoder_unittest.cc
@@ -97,8 +97,7 @@ class VideoEncoderTest : public ::testing::Test {
   virtual void SetUp() {
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
-        task_runner_, task_runner_, task_runner_, task_runner_,
-        GetDefaultCastLoggingConfig());
+        task_runner_, task_runner_, task_runner_, task_runner_);
   }
 
   void Configure(uint8 max_unacked_frames) {
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index 2591b12..a0acb83 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -60,7 +60,7 @@ VideoSender::VideoSender(
       max_frame_rate_(video_config.max_frame_rate),
       cast_environment_(cast_environment),
       rtcp_feedback_(new LocalRtcpVideoSenderFeedback(this)),
-      rtp_sender_(new RtpSender(cast_environment, NULL, &video_config,
+      rtp_sender_(new RtpSender(cast_environment->Clock(), NULL, &video_config,
                                 paced_packet_sender)),
       last_acked_frame_id_(-1),
       last_sent_frame_id_(-1),
@@ -103,7 +103,7 @@ VideoSender::VideoSender(
   }
 
   rtcp_.reset(new Rtcp(
-      cast_environment_,
+      cast_environment_->Clock(),
       rtcp_feedback_.get(),
       paced_packet_sender,
       rtp_video_sender_statistics_.get(),
@@ -311,8 +311,6 @@ void VideoSender::OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) {
   base::TimeDelta max_rtt;
 
   if (rtcp_->Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt)) {
-    cast_environment_->Logging()->InsertGenericEvent(kRttMs,
-        rtt.InMilliseconds());
     // Don't use a RTT lower than our average.
     rtt = std::max(rtt, avg_rtt);
   } else {
@@ -367,10 +365,6 @@ void VideoSender::ReceivedAck(uint32 acked_frame_id) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   VLOG(1) << "ReceivedAck:" << acked_frame_id;
   last_acked_frame_id_ = static_cast<int>(acked_frame_id);
-  cast_environment_->Logging()->InsertGenericEvent(kAckReceived,
-                                                   acked_frame_id);
-  VLOG(1) << "ReceivedAck:" << static_cast<int>(acked_frame_id);
-  last_acked_frame_id_ = acked_frame_id;
   UpdateFramesInFlight();
 }
 
diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc
index 9c9bffc..3269c85 100644
--- a/media/cast/video_sender/video_sender_unittest.cc
+++ b/media/cast/video_sender/video_sender_unittest.cc
@@ -88,8 +88,7 @@ class VideoSenderTest : public ::testing::Test {
   virtual void SetUp() {
     task_runner_ = new test::FakeTaskRunner(&testing_clock_);
     cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
-       task_runner_, task_runner_, task_runner_, task_runner_,
-       GetDefaultCastLoggingConfig());
+       task_runner_, task_runner_, task_runner_, task_runner_);
   }
 
   I420VideoFrame* AllocateNewVideoFrame() {