Clean-up: media::PipelineMetadata stores the rotated video size.

media/blink/webmediaplayer_impl_unittest.cc

 // Copyright 2016 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 "media/blink/webmediaplayer_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 660 matching lines @@
   ASSERT_EQ(blink::WebSize(1920, 1080), wmpi_->naturalSize());
 }
 
 TEST_F(WebMediaPlayerImplTest, NaturalSizeChange_Rotated) {
   InitializeWebMediaPlayerImpl();
   PipelineMetadata metadata;
   metadata.has_video = true;
   metadata.natural_size = gfx::Size(320, 240);
   metadata.video_rotation = VIDEO_ROTATION_90;
 
+  OnMetadata(metadata);
+  ASSERT_EQ(blink::WebSize(320, 240), wmpi_->naturalSize());
+
   // For 90/270deg rotations, the natural size should be transposed.
-  OnMetadata(metadata);
-  ASSERT_EQ(blink::WebSize(240, 320), wmpi_->naturalSize());
-
   OnVideoNaturalSizeChange(gfx::Size(1920, 1080));
   ASSERT_EQ(blink::WebSize(1080, 1920), wmpi_->naturalSize());
 }
 
 // Audible backgrounded videos are not suspended if delegate_ allows it.
 TEST_F(WebMediaPlayerImplTest, ComputePlayState_BackgroundedVideoPlaying) {
   InitializeWebMediaPlayerImpl();
   WebMediaPlayerImpl::PlayState state;
   SetMetadata(true, true);
   SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
@@ skipping 54 matching lines @@
   EXPECT_CALL(delegate_, DidPlay(_, true, false, false, _));
   client_.set_is_autoplaying_muted(true);
   SetDelegateState(WebMediaPlayerImpl::DelegateState::PLAYING);
 
   EXPECT_CALL(delegate_, DidPlay(_, true, true, false, _));
   client_.set_is_autoplaying_muted(false);
   wmpi_->setVolume(1.0);
 }
 
 }  // namespace media