Removed unused code and improved naming

BUG=

Review URL: https://chromiumcodereview.appspot.com/23431031

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

6 files changed, 3 insertions, 16 deletions

diff --git a/media/cast/framer/cast_message_builder_unittest.cc b/media/cast/framer/cast_message_builder_unittest.cc
index 13c6a463..f9bb066 100644
--- a/media/cast/framer/cast_message_builder_unittest.cc
+++ b/media/cast/framer/cast_message_builder_unittest.cc
@@ -27,10 +27,6 @@ class NackFeedbackVerification : public RtpPayloadFeedback {
         last_frame_acked_(0) {}
 
 
-  virtual void RequestKeyFrame() OVERRIDE {
-    request_key_frame_ = true;
-  }
-
   virtual void CastFeedback(const RtcpCastMessage& cast_feedback) OVERRIDE {
     EXPECT_EQ(kSsrc, cast_feedback.media_ssrc_);
 
@@ -64,18 +60,12 @@ class NackFeedbackVerification : public RtpPayloadFeedback {
     return ret_val;
   }
 
-  bool request_key_frame() {
-    bool ret_val = request_key_frame_;
-    request_key_frame_ = false;
-    return ret_val;
-  }
   uint8 last_frame_acked() { return last_frame_acked_; }
 
  private:
   bool triggered_;
   MissingPacketsMap missing_packets_;  // Missing packets per frame.
   uint8 last_frame_acked_;
-  bool request_key_frame_;
 };
 
 class CastMessageBuilderTest : public ::testing::Test {
diff --git a/media/cast/rtp_common/mock_rtp_payload_feedback.h b/media/cast/rtp_common/mock_rtp_payload_feedback.h
index 00ba183..d962ff8 100644
--- a/media/cast/rtp_common/mock_rtp_payload_feedback.h
+++ b/media/cast/rtp_common/mock_rtp_payload_feedback.h
@@ -15,8 +15,6 @@ class MockRtpPayloadFeedback : public RtpPayloadFeedback {
  public:
   MOCK_METHOD1(CastFeedback,
                void(const RtcpCastMessage& cast_feedback));
-
-  MOCK_METHOD0(RequestKeyFrame, void());
 };
 
 }  // namespace cast
diff --git a/media/cast/rtp_common/rtp_defines.h b/media/cast/rtp_common/rtp_defines.h
index 2268fa9..dc64c36 100644
--- a/media/cast/rtp_common/rtp_defines.h
+++ b/media/cast/rtp_common/rtp_defines.h
@@ -37,7 +37,6 @@ struct RtpCastHeader {
 class RtpPayloadFeedback {
  public:
   virtual void CastFeedback(const RtcpCastMessage& cast_feedback) = 0;
-  virtual void RequestKeyFrame() = 0;  // TODO(pwestin): can we remove this?
 
  protected:
   virtual ~RtpPayloadFeedback() {}
diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc b/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
index d24ef4b..eaf6fbd 100644
--- a/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
+++ b/media/cast/video_sender/codecs/vp8/vp8_encoder.cc
@@ -327,7 +327,7 @@ void Vp8Encoder::LatestFrameIdToReference(uint8 frame_id) {
   }
 }
 
-void Vp8Encoder::RequestKeyFrame() {
+void Vp8Encoder::GenerateKeyFrame() {
   key_frame_requested_ = true;
 }
 
diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.h b/media/cast/video_sender/codecs/vp8/vp8_encoder.h
index 354d529..3b041a0 100644
--- a/media/cast/video_sender/codecs/vp8/vp8_encoder.h
+++ b/media/cast/video_sender/codecs/vp8/vp8_encoder.h
@@ -33,7 +33,7 @@ class Vp8Encoder {
   void UpdateRates(uint32 new_bitrate);
 
   // Set the next frame to be a key frame.
-  void RequestKeyFrame();
+  void GenerateKeyFrame();
 
   void LatestFrameIdToReference(uint8 frame_id);
 
diff --git a/media/cast/video_sender/video_encoder.cc b/media/cast/video_sender/video_encoder.cc
index 0b7202b..94a296c 100644
--- a/media/cast/video_sender/video_encoder.cc
+++ b/media/cast/video_sender/video_encoder.cc
@@ -59,7 +59,7 @@ void VideoEncoder::EncodeVideoFrameEncoderThread(
     const FrameEncodedCallback& frame_encoded_callback,
     const base::Closure frame_release_callback) {
   if (dynamic_config.key_frame_requested) {
-    vp8_encoder_->RequestKeyFrame();
+    vp8_encoder_->GenerateKeyFrame();
   }
   vp8_encoder_->LatestFrameIdToReference(
       dynamic_config.latest_frame_id_to_reference);