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

1 files changed, 5 insertions, 13 deletions

diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc
index be636bb..dddec16 100644
--- a/media/cast/cast_environment.cc
+++ b/media/cast/cast_environment.cc
@@ -17,15 +17,13 @@ CastEnvironment::CastEnvironment(
     scoped_refptr<TaskRunner> audio_encode_thread_proxy,
     scoped_refptr<TaskRunner> audio_decode_thread_proxy,
     scoped_refptr<TaskRunner> video_encode_thread_proxy,
-    scoped_refptr<TaskRunner> video_decode_thread_proxy,
-    const CastLoggingConfig& config)
+    scoped_refptr<TaskRunner> video_decode_thread_proxy)
     : clock_(clock),
       main_thread_proxy_(main_thread_proxy),
       audio_encode_thread_proxy_(audio_encode_thread_proxy),
       audio_decode_thread_proxy_(audio_decode_thread_proxy),
       video_encode_thread_proxy_(video_encode_thread_proxy),
-      video_decode_thread_proxy_(video_decode_thread_proxy),
-      logging_(new LoggingImpl(clock, main_thread_proxy, config)) {
+      video_decode_thread_proxy_(video_decode_thread_proxy) {
   DCHECK(main_thread_proxy) << "Main thread required";
 }
 
@@ -64,7 +62,7 @@ scoped_refptr<TaskRunner> CastEnvironment::GetMessageTaskRunnerForThread(
     case CastEnvironment::VIDEO_DECODER:
       return video_decode_thread_proxy_;
     default:
-      NOTREACHED() << "Invalid Thread identifier";
+      NOTREACHED() << "Invalid Thread ID.";
       return NULL;
   }
 }
@@ -82,20 +80,14 @@ bool CastEnvironment::CurrentlyOn(ThreadId identifier) {
     case CastEnvironment::VIDEO_DECODER:
       return video_decode_thread_proxy_->RunsTasksOnCurrentThread();
     default:
-      NOTREACHED() << "Invalid thread identifier";
+      NOTREACHED() << "Wrong thread identifier";
       return false;
   }
 }
 
-base::TickClock* CastEnvironment::Clock() const {
+base::TickClock* CastEnvironment::Clock() {
   return clock_;
 }
 
-LoggingImpl* CastEnvironment::Logging() {
-  DCHECK(CurrentlyOn(CastEnvironment::MAIN)) <<
-      "Must be called from main thread";
-  return logging_.get();
-}
-
 }  // namespace cast
 }  // namespace media