Revert of Remove AudioBuffer::set_duration(), instead base on frames.

media/base/audio_splicer_unittest.cc

Index: media/base/audio_splicer_unittest.cc
diff --git a/media/base/audio_splicer_unittest.cc b/media/base/audio_splicer_unittest.cc
index 2e46b9fb12753ecaef1b55fdb8bef1534fc829ac..71e17283764d3176efb7bc3df16f831fbe5d974b 100644
--- a/media/base/audio_splicer_unittest.cc
+++ b/media/base/audio_splicer_unittest.cc
@@ -35,15 +35,16 @@
   }
 
   scoped_refptr<AudioBuffer> GetNextInputBuffer(float value, int frame_size) {
-    scoped_refptr<AudioBuffer> buffer =
-        MakeAudioBuffer<float>(kSampleFormat,
-                               kChannelLayout,
-                               kChannels,
-                               kDefaultSampleRate,
-                               value,
-                               0.0f,
-                               frame_size,
-                               input_timestamp_helper_.GetTimestamp());
+    scoped_refptr<AudioBuffer> buffer = MakeAudioBuffer<float>(
+        kSampleFormat,
+        kChannelLayout,
+        kChannels,
+        kDefaultSampleRate,
+        value,
+        0.0f,
+        frame_size,
+        input_timestamp_helper_.GetTimestamp(),
+        input_timestamp_helper_.GetFrameDuration(frame_size));
     input_timestamp_helper_.AddFrames(frame_size);
     return buffer;
   }
@@ -138,7 +139,8 @@
                                     input->sample_rate(),
                                     input->frame_count(),
                                     &input->channel_data()[0],
-                                    input->timestamp());
+                                    input->timestamp(),
+                                    input->duration());
     return splicer_.AddInput(buffer_copy);
   }
 
@@ -246,8 +248,7 @@
   base::TimeDelta gap_duration = input_2->timestamp() - gap_timestamp;
   EXPECT_GT(gap_duration, base::TimeDelta());
   EXPECT_EQ(gap_timestamp, output_2->timestamp());
-  EXPECT_NEAR(
-      gap_duration.InMicroseconds(), output_2->duration().InMicroseconds(), 1);
+  EXPECT_EQ(gap_duration, output_2->duration());
   EXPECT_EQ(kGapSize, output_2->frame_count());
   EXPECT_TRUE(VerifyData(output_2, 0.0f));
 
@@ -443,7 +444,7 @@
   VerifyPreSpliceOutput(overlapped_buffer,
                         overlapping_buffer,
                         221,
-                        base::TimeDelta::FromMicroseconds(5011));
+                        base::TimeDelta::FromMicroseconds(5012));
 
   // Due to rounding the crossfade size may vary by up to a frame.
   const int kExpectedCrossfadeSize = 220;
@@ -618,13 +619,11 @@
       GetNextInputBuffer(1.0f, kBufferSize);
   // Fuzz the duration slightly so that the buffer overlaps the splice timestamp
   // by a microsecond, which is not enough to crossfade.
-  const base::TimeDelta kSpliceTimestamp =
-      input_timestamp_helper_.GetTimestamp() -
-      base::TimeDelta::FromMicroseconds(1);
-  splicer_.SetSpliceTimestamp(kSpliceTimestamp);
+  first_buffer->set_duration(first_buffer->duration() +
+                             base::TimeDelta::FromMicroseconds(1));
+  splicer_.SetSpliceTimestamp(input_timestamp_helper_.GetTimestamp());
   scoped_refptr<AudioBuffer> second_buffer =
       GetNextInputBuffer(0.0f, kBufferSize);
-  second_buffer->set_timestamp(kSpliceTimestamp);
 
   // The splicer should be internally queuing input since |first_buffer| is part
   // of the supposed splice.