[go: nahoru, domu]

Convert media constants to constexpr.

Replaces silly MEDIA_EXPORT inline functions with constexpr
equivalents. Fingers crossed it passes the bots!

BUG=627984
TEST=compiles

Review-Url: https://codereview.chromium.org/2158923004
Cr-Commit-Position: refs/heads/master@{#406326}
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index fe7f976c..bd12003 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -90,11 +90,9 @@
     int channels = ChannelLayoutToChannelCount(config.channel_layout());
     if (channels < 0)
       channels = 0;
-    decoded_frame_ = AudioBuffer::CreateEmptyBuffer(config.channel_layout(),
-                                                    channels,
-                                                    kSampleRate,
-                                                    kFakeAudioFrameSize,
-                                                    kNoTimestamp());
+    decoded_frame_ = AudioBuffer::CreateEmptyBuffer(
+        config.channel_layout(), channels, kSampleRate, kFakeAudioFrameSize,
+        kNoTimestamp);
     decoded_frame_list_.push_back(decoded_frame_);
 
     decoder_->Initialize(config, cdm_context_.get(), NewExpectedBoolCB(success),
@@ -345,16 +343,12 @@
 
   scoped_refptr<AudioBuffer> frame_a = AudioBuffer::CreateEmptyBuffer(
       config_.channel_layout(),
-      ChannelLayoutToChannelCount(config_.channel_layout()),
-      kSampleRate,
-      kFakeAudioFrameSize,
-      kNoTimestamp());
+      ChannelLayoutToChannelCount(config_.channel_layout()), kSampleRate,
+      kFakeAudioFrameSize, kNoTimestamp);
   scoped_refptr<AudioBuffer> frame_b = AudioBuffer::CreateEmptyBuffer(
       config_.channel_layout(),
-      ChannelLayoutToChannelCount(config_.channel_layout()),
-      kSampleRate,
-      kFakeAudioFrameSize,
-      kNoTimestamp());
+      ChannelLayoutToChannelCount(config_.channel_layout()), kSampleRate,
+      kFakeAudioFrameSize, kNoTimestamp);
   decoded_frame_list_.push_back(frame_a);
   decoded_frame_list_.push_back(frame_b);