Updates WebMediaPlayerAndroid and MediaSourceDelegate to respect

media/base/android/media_source_player_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 11 matching lines @@
 
 // Helper macro to skip the test if MediaCodecBridge isn't available.
 #define SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE()        \
   do {                                                            \
     if (!MediaCodecBridge::IsAvailable()) {                       \
       VLOG(0) << "Could not run test - not supported on device."; \
       return;                                                     \
     }                                                             \
   } while (0)
 
-const int kDefaultDurationInMs = 10000;
+const base::TimeDelta kDefaultDuration =
+    base::TimeDelta::FromMilliseconds(10000);
 
 // TODO(wolenetz/qinmin): Simplify tests with more effective mock usage, and
 // fix flaky pointer-based MDJ inequality testing. See http://crbug.com/327839.
 
 // Mock of MediaPlayerManager for testing purpose.
 class MockMediaPlayerManager : public MediaPlayerManager {
  public:
   explicit MockMediaPlayerManager(base::MessageLoop* message_loop)
       : message_loop_(message_loop),
         playback_completed_(false),
@@ skipping 201 matching lines @@
   // use by tests, only where required.
   bool IsPendingSurfaceChange() {
     return player_.IsEventPending(player_.SURFACE_CHANGE_EVENT_PENDING);
   }
 
   DemuxerConfigs CreateAudioDemuxerConfigs(AudioCodec audio_codec) {
     DemuxerConfigs configs;
     configs.audio_codec = audio_codec;
     configs.audio_channels = 2;
     configs.is_audio_encrypted = false;
-    configs.duration_ms = kDefaultDurationInMs;
+    configs.duration = kDefaultDuration;
 
     if (audio_codec == kCodecVorbis) {
       configs.audio_sampling_rate = 44100;
       scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(
           "vorbis-extradata");
       configs.audio_extra_data = std::vector<uint8>(
           buffer->data(),
           buffer->data() + buffer->data_size());
       return configs;
     }
 
     // Other codecs are not yet supported by this helper.
     EXPECT_EQ(audio_codec, kCodecAAC);
 
     configs.audio_sampling_rate = 48000;
     uint8 aac_extra_data[] = { 0x13, 0x10 };
     configs.audio_extra_data = std::vector<uint8>(
         aac_extra_data,
         aac_extra_data + 2);
     return configs;
   }
 
   DemuxerConfigs CreateVideoDemuxerConfigs() {
     DemuxerConfigs configs;
     configs.video_codec = kCodecVP8;
     configs.video_size = gfx::Size(320, 240);
     configs.is_video_encrypted = false;
-    configs.duration_ms = kDefaultDurationInMs;
+    configs.duration = kDefaultDuration;
     return configs;
   }
 
   DemuxerConfigs CreateAudioVideoDemuxerConfigs() {
     DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis);
     configs.video_codec = kCodecVP8;
     configs.video_size = gfx::Size(320, 240);
     configs.is_video_encrypted = false;
     return configs;
   }
@@ skipping 1765 matching lines @@
   DemuxerConfigs configs = CreateVideoDemuxerConfigs();
   configs.is_video_encrypted = true;
 
   player_.OnDemuxerConfigsAvailable(configs);
   CreateNextTextureAndSetVideoSurface();
   EXPECT_FALSE(IsPendingSurfaceChange());
   EXPECT_FALSE(GetMediaDecoderJob(false));
 }
 
 }  // namespace media