Replace VideoDecoder::media_format() with significantly simpler width()/height() methods.

content/renderer/media/rtc_video_decoder_unittest.cc

 // Copyright (c) 2011 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.
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "content/renderer/media/rtc_video_decoder.h"
@@ skipping 28 matching lines @@
 using media::StatisticsCallback;
 
 class RTCVideoDecoderTest : public testing::Test {
  protected:
   static const int kWidth;
   static const int kHeight;
   static const char* kUrl;
   static const PipelineStatistics kStatistics;
 
   RTCVideoDecoderTest() {
-    MediaFormat media_format;
     decoder_ = new RTCVideoDecoder(&message_loop_, kUrl);
     renderer_ = new MockVideoRenderer();
 
     DCHECK(decoder_);
 
     // Inject mocks and prepare a demuxer stream.
     decoder_->set_host(&host_);
 
     EXPECT_CALL(stats_callback_object_, OnStatistics(_))
         .Times(AnyNumber());
@@ skipping 29 matching lines @@
 
 const int RTCVideoDecoderTest::kWidth = 176;
 const int RTCVideoDecoderTest::kHeight = 144;
 const char* RTCVideoDecoderTest::kUrl = "media://remote/0";
 const PipelineStatistics RTCVideoDecoderTest::kStatistics;
 
 TEST_F(RTCVideoDecoderTest, Initialize_Successful) {
   InitializeDecoderSuccessfully();
 
   // Test that the output media format is an uncompressed video surface that
-  // matches the dimensions specified by rtc.
-  const MediaFormat& media_format = decoder_->media_format();
-  int width = 0;
-  int height = 0;
-  EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kWidth, &width));
-  EXPECT_EQ(kWidth, width);
-  EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kHeight, &height));
-  EXPECT_EQ(kHeight, height);
+  // matches the dimensions specified by RTC.
+  EXPECT_EQ(kWidth, decoder_->width());
+  EXPECT_EQ(kHeight, decoder_->height());
 }
 
 TEST_F(RTCVideoDecoderTest, DoSeek) {
   const base::TimeDelta kZero;
 
   InitializeDecoderSuccessfully();
 
   decoder_->set_consume_video_frame_callback(
       base::Bind(&MockVideoRenderer::ConsumeVideoFrame,
                  base::Unretained(renderer_.get())));
@@ skipping 40 matching lines @@
 
   int new_width = kWidth * 2;
   int new_height = kHeight * 2;
   int new_reserved = 0;
 
   EXPECT_CALL(host_,
               SetVideoSize(new_width, new_height)).WillRepeatedly(Return());
 
   decoder_->SetSize(new_width, new_height, new_reserved);
 
-  const MediaFormat& media_format = decoder_->media_format();
-  int width = 0;
-  int height = 0;
-  EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kWidth, &width));
-  EXPECT_EQ(new_width, width);
-  EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kHeight, &height));
-  EXPECT_EQ(new_height, height);
+  EXPECT_EQ(new_width, decoder_->width());
+  EXPECT_EQ(new_height, decoder_->height());
 
   message_loop_.RunAllPending();
 }