Revert of [Cast] Compute utilization metrics and add performance overlay.

media/cast/sender/video_encoder.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_H_
 #define MEDIA_CAST_SENDER_VIDEO_ENCODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/video_frame.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
-#include "media/cast/sender/sender_encoded_frame.h"
 #include "media/cast/sender/video_frame_factory.h"
 
 namespace media {
 namespace cast {
 
 // All these functions are called from the main cast thread.
 class VideoEncoder {
  public:
-  // Callback used to deliver an encoded frame on the Cast MAIN thread.
-  using FrameEncodedCallback =
-      base::Callback<void(scoped_ptr<SenderEncodedFrame>)>;
+  typedef base::Callback<void(scoped_ptr<EncodedFrame>)> FrameEncodedCallback;
 
   // Creates a VideoEncoder instance from the given |video_config| and based on
   // the current platform's hardware/library support; or null if no
   // implementation will suffice.  The instance will run |status_change_cb| at
   // some point in the future to indicate initialization success/failure.
   //
   // All VideoEncoder instances returned by this function support encoding
   // sequences of differently-size VideoFrames.
   //
   // TODO(miu): Remove the CreateVEA callbacks.  http://crbug.com/454029
@@ skipping 35 matching lines @@
   // network congestion, it is necessary to flush out of the encoder all
   // submitted frames so that eventually new frames may be encoded. Like
   // EncodeVideoFrame(), the encoder will process this request asynchronously.
   virtual void EmitFrames();
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_VIDEO_ENCODER_H_